From 720dcb0fe51684b6c2508e4af9cf11c186822399 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 27 Mar 2018 19:29:58 +0200 Subject: [PATCH] Fix #1300 --- app/Http/Controllers/AccountController.php | 7 +++- app/Http/Controllers/AttachmentController.php | 3 ++ app/Http/Controllers/BillController.php | 6 +++ app/Http/Controllers/CategoryController.php | 5 +++ app/Http/Controllers/CurrencyController.php | 8 ++++ app/Http/Controllers/DebugController.php | 9 +++-- app/Http/Controllers/ExportController.php | 1 + app/Http/Controllers/HomeController.php | 4 ++ app/Http/Controllers/JavascriptController.php | 1 + app/Http/Controllers/PiggyBankController.php | 2 +- app/Http/Controllers/ProfileController.php | 1 + app/Http/Controllers/ReportController.php | 6 +-- app/Http/Controllers/RuleController.php | 3 +- app/Http/Controllers/RuleGroupController.php | 1 + app/Http/Controllers/TagController.php | 4 +- .../Controllers/TransactionController.php | 37 +++---------------- 16 files changed, 53 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index b2e9c1c1b0..f43e22938e 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -84,6 +84,7 @@ class AccountController extends Controller * @param string $what * * @return View + * @throws \RuntimeException */ public function create(Request $request, string $what = 'asset') { @@ -132,6 +133,7 @@ class AccountController extends Controller * @param Account $account * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function destroy(Request $request, Account $account) { @@ -161,6 +163,7 @@ class AccountController extends Controller * @SuppressWarnings(PHPMD.CyclomaticComplexity) // long and complex but not that excessively so. * @SuppressWarnings(PHPMD.ExcessiveMethodLength) * + * @throws \RuntimeException */ public function edit(Request $request, Account $account, AccountRepositoryInterface $repository) { @@ -375,12 +378,13 @@ class AccountController extends Controller * @param AccountFormRequest $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function store(AccountFormRequest $request) { $data = $request->getAccountData(); $account = $this->repository->store($data); - $request->session()->flash('success', strval(trans('firefly.stored_new_account', ['name' => $account->name]))); + $request->session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name])); Preferences::mark(); // update preferences if necessary: @@ -408,6 +412,7 @@ class AccountController extends Controller * @param Account $account * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function update(AccountFormRequest $request, Account $account) { diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index 14617d4970..bce1cde2fe 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -80,6 +80,7 @@ class AttachmentController extends Controller * @param Attachment $attachment * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function destroy(Request $request, Attachment $attachment) { @@ -129,6 +130,7 @@ class AttachmentController extends Controller * @param Attachment $attachment * * @return View + * @throws \RuntimeException */ public function edit(Request $request, Attachment $attachment) { @@ -152,6 +154,7 @@ class AttachmentController extends Controller * @param Attachment $attachment * * @return \Illuminate\Http\RedirectResponse + * @throws \RuntimeException */ public function update(AttachmentFormRequest $request, Attachment $attachment) { diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 3b48b7aac1..e275a2f2b1 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -75,6 +75,7 @@ class BillController extends Controller * @param Request $request * * @return View + * @throws \RuntimeException */ public function create(Request $request) { @@ -113,6 +114,7 @@ class BillController extends Controller * @param Bill $bill * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function destroy(Request $request, BillRepositoryInterface $repository, Bill $bill) { @@ -130,6 +132,7 @@ class BillController extends Controller * @param Bill $bill * * @return View + * @throws \RuntimeException */ public function edit(Request $request, Bill $bill) { @@ -198,6 +201,7 @@ class BillController extends Controller * @param Bill $bill * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function rescan(Request $request, BillRepositoryInterface $repository, Bill $bill) { @@ -264,6 +268,7 @@ class BillController extends Controller * @param BillRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse + * @throws \RuntimeException */ public function store(BillFormRequest $request, BillRepositoryInterface $repository) { @@ -299,6 +304,7 @@ class BillController extends Controller * @param Bill $bill * * @return \Illuminate\Http\RedirectResponse + * @throws \RuntimeException */ public function update(BillFormRequest $request, BillRepositoryInterface $repository, Bill $bill) { diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 668cb64f1e..bb1bbea092 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -77,6 +77,7 @@ class CategoryController extends Controller * @param Request $request * * @return View + * @throws \RuntimeException */ public function create(Request $request) { @@ -109,6 +110,7 @@ class CategoryController extends Controller * @param Category $category * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function destroy(Request $request, Category $category) { @@ -126,6 +128,7 @@ class CategoryController extends Controller * @param Category $category * * @return View + * @throws \RuntimeException */ public function edit(Request $request, Category $category) { @@ -297,6 +300,7 @@ class CategoryController extends Controller * @param CategoryRepositoryInterface $repository * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function store(CategoryFormRequest $request, CategoryRepositoryInterface $repository) { @@ -323,6 +327,7 @@ class CategoryController extends Controller * @param Category $category * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function update(CategoryFormRequest $request, CategoryRepositoryInterface $repository, Category $category) { diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 4dea312903..1a2ce4c916 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -67,6 +67,7 @@ class CurrencyController extends Controller * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View + * @throws \RuntimeException */ public function create(Request $request) { @@ -93,6 +94,7 @@ class CurrencyController extends Controller * @param TransactionCurrency $currency * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function defaultCurrency(Request $request, TransactionCurrency $currency) { @@ -111,6 +113,7 @@ class CurrencyController extends Controller * @param TransactionCurrency $currency * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View + * @throws \RuntimeException */ public function delete(Request $request, TransactionCurrency $currency) { @@ -140,6 +143,7 @@ class CurrencyController extends Controller * @param TransactionCurrency $currency * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function destroy(Request $request, TransactionCurrency $currency) { @@ -168,6 +172,7 @@ class CurrencyController extends Controller * @param TransactionCurrency $currency * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View + * @throws \RuntimeException */ public function edit(Request $request, TransactionCurrency $currency) { @@ -196,6 +201,7 @@ class CurrencyController extends Controller * @param Request $request * * @return View + * @throws \RuntimeException */ public function index(Request $request) { @@ -226,6 +232,7 @@ class CurrencyController extends Controller * @param CurrencyFormRequest $request * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function store(CurrencyFormRequest $request) { @@ -257,6 +264,7 @@ class CurrencyController extends Controller * @param TransactionCurrency $currency * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function update(CurrencyFormRequest $request, TransactionCurrency $currency) { diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index c1271ddfa9..38bf6e7fea 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -50,6 +50,7 @@ class DebugController extends Controller * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @throws \InvalidArgumentException */ public function index(Request $request) { @@ -57,11 +58,11 @@ class DebugController extends Controller $replace = ['\~', '# ']; $phpVersion = str_replace($search, $replace, PHP_VERSION); - $phpOs = str_replace($search, $replace, php_uname()); + $phpOs = str_replace($search, $replace, PHP_OS); $interface = PHP_SAPI; $now = Carbon::create()->format('Y-m-d H:i:s e'); - $extensions = join(', ', get_loaded_extensions()); - $drivers = join(', ', DB::availableDrivers()); + $extensions = implode(', ', get_loaded_extensions()); + $drivers = implode(', ', DB::availableDrivers()); $currentDriver = DB::getDriverName(); $userAgent = $request->header('user-agent'); $isSandstorm = var_export(env('IS_SANDSTORM', 'unknown'), true); @@ -98,6 +99,7 @@ class DebugController extends Controller $logContent = file_get_contents($logFile); } catch (Exception $e) { // don't care + Log::debug(sprintf('Could not read log file. %s', $e->getMessage())); } } } @@ -110,7 +112,6 @@ class DebugController extends Controller compact( 'phpVersion', 'extensions', 'localeAttempts', - 'carbon', 'appEnv', 'appDebug', 'appLog', diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index c4d21f257d..4cb9e5c422 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -111,6 +111,7 @@ class ExportController extends Controller * @param ExportJobRepositoryInterface $jobs * * @return View + * @throws \InvalidArgumentException */ public function index(AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs) { diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index e159f5f33b..a32d290b40 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -62,6 +62,7 @@ class HomeController extends Controller * @param Request $request * * @return \Illuminate\Http\JsonResponse + * @throws \RuntimeException */ public function dateRange(Request $request) { @@ -116,6 +117,7 @@ class HomeController extends Controller * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function flush(Request $request) { @@ -132,6 +134,7 @@ class HomeController extends Controller Artisan::call('twig:clean'); } catch (Exception $e) { // dont care + Log::debug('Called twig:clean.'); } Log::debug('Call view:clear...'); Artisan::call('view:clear'); @@ -229,6 +232,7 @@ class HomeController extends Controller * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function testFlash(Request $request) { diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 74516ae6a6..4fcdc4f734 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -92,6 +92,7 @@ class JavascriptController extends Controller * @param CurrencyRepositoryInterface $currencyRepository * * @return \Illuminate\Http\Response + * @throws \RuntimeException */ public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository) { diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 15c7c86d75..d81ed60593 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -251,7 +251,7 @@ class PiggyBankController extends Controller if (is_array($data)) { foreach ($data as $order => $id) { - $repository->setOrder(intval($id), ($order + 1)); + $repository->setOrder(intval($id), $order + 1); } } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index e2988e0b18..a039ec2212 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -218,6 +218,7 @@ class ProfileController extends Controller * @param UserRepositoryInterface $repository * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \RuntimeException */ public function postChangeEmail(EmailFormRequest $request, UserRepositoryInterface $repository) { diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 9ef86b805e..c79b940008 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -101,9 +101,8 @@ class ReportController extends Controller $generator = ReportGeneratorFactory::reportGenerator('Account', $start, $end); $generator->setAccounts($accounts); $generator->setExpense($expense); - $result = $generator->generate(); - return $result; + return $generator->generate(); } /** @@ -138,9 +137,8 @@ class ReportController extends Controller $generator = ReportGeneratorFactory::reportGenerator('Audit', $start, $end); $generator->setAccounts($accounts); - $result = $generator->generate(); - return $result; + return $generator->generate(); } /** diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 55c41e8e44..2959754ece 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -311,6 +311,7 @@ class RuleController extends Controller * @param Rule $rule * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @throws \InvalidArgumentException */ public function selectTransactions(AccountRepositoryInterface $repository, Rule $rule) { @@ -677,7 +678,7 @@ class RuleController extends Controller $triggers[] = [ 'type' => $triggerType, 'value' => $data['rule-trigger-values'][$index], - 'stopProcessing' => 1 === intval($data['rule-trigger-stop'][$index]) ? true : false, + 'stopProcessing' => 1 === (int)$data['rule-trigger-stop'][$index], ]; } } diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index d31b7d17a1..366c5c6d0e 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -184,6 +184,7 @@ class RuleGroupController extends Controller * @param RuleGroup $ruleGroup * * @return View + * @throws \InvalidArgumentException */ public function selectTransactions(AccountRepositoryInterface $repository, RuleGroup $ruleGroup) { diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 5dce01ca3c..c4e1e05d69 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -333,8 +333,8 @@ class TagController extends Controller 'string' => $end->format('Y-m-d'), 'name' => app('navigation')->periodShow($end, $range), 'date' => clone $end, - 'spent' => $this->repository->spentInperiod($tag, $end, $currentEnd), - 'earned' => $this->repository->earnedInperiod($tag, $end, $currentEnd), + 'spent' => $this->repository->spentInPeriod($tag, $end, $currentEnd), + 'earned' => $this->repository->earnedInPeriod($tag, $end, $currentEnd), ]; $collection->push($arr); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index d1727bb020..0d7a950ed2 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -113,37 +113,6 @@ class TransactionController extends Controller $transactions->setPath($path); return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'transactions', 'periods', 'start', 'end')); - - - // - - - // // prep for "all" view. - // if ('all' === $moment) { - // $subTitle = trans('firefly.all_' . $what); - // $first = $this->repository->first(); - // $start = $first->date ?? new Carbon; - // $end = new Carbon; - // $path = route('transactions.index', [$what, 'all']); - // } - // - // // prep for "specific date" view. - // if (strlen($moment) > 0 && 'all' !== $moment) { - // $start = new Carbon($moment); - // $end = app('navigation')->endOfPeriod($start, $range); - // $path = route('transactions.index', [$what, $moment]); - // - // } - - // // prep for current period - // if (0 === strlen($moment)) { - // $start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range)); - // $end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range)); - // $subTitle = trans( - // 'firefly.title_' . $what . '_between', - // ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - // ); - // } } /** @@ -265,13 +234,16 @@ class TransactionController extends Controller /** * @param string $what * + * @param Carbon $date + * * @return Collection */ private function getPeriodOverview(string $what, Carbon $date): Collection { $range = Preferences::get('viewRange', '1M')->data; $first = $this->repository->first(); - $start = (new Carbon)->subYear(); + $start = new Carbon; + $start->subYear(); $types = config('firefly.transactionTypesByWhat.' . $what); $entries = new Collection; if (null !== $first) { @@ -280,6 +252,7 @@ class TransactionController extends Controller if ($date < $start) { list($start, $date) = [$date, $start]; // @codeCoverageIgnore } + /** @var array $dates */ $dates = app('navigation')->blockPeriods($start, $date, $range);