kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1300

Browse Source
This commit is contained in:
James Cole
2018-03-27 19:29:58 +02:00
parent c86b207b1c
commit 720dcb0fe5
16 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,7 @@ class AccountController extends Controller
* @param string $what * @param string $what
* *
* @return View * @return View
* @throws \RuntimeException
*/ */
public function create(Request $request, string $what = 'asset') public function create(Request $request, string $what = 'asset')
{ {
@@ -132,6 +133,7 @@ class AccountController extends Controller
* @param Account $account * @param Account $account
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function destroy(Request $request, Account $account) 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.CyclomaticComplexity) // long and complex but not that excessively so.
* @SuppressWarnings(PHPMD.ExcessiveMethodLength) * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* *
* @throws \RuntimeException
*/ */
public function edit(Request $request, Account $account, AccountRepositoryInterface $repository) public function edit(Request $request, Account $account, AccountRepositoryInterface $repository)
{ {
@@ -375,12 +378,13 @@ class AccountController extends Controller
* @param AccountFormRequest $request * @param AccountFormRequest $request
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function store(AccountFormRequest $request) public function store(AccountFormRequest $request)
{ {
$data = $request->getAccountData(); $data = $request->getAccountData();
$account = $this->repository->store($data); $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(); Preferences::mark();
// update preferences if necessary: // update preferences if necessary:
@@ -408,6 +412,7 @@ class AccountController extends Controller
* @param Account $account * @param Account $account
* *
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function update(AccountFormRequest $request, Account $account) public function update(AccountFormRequest $request, Account $account)
{ {

3
app/Http/Controllers/AttachmentController.php
View File

@@ -80,6 +80,7 @@ class AttachmentController extends Controller
* @param Attachment $attachment * @param Attachment $attachment
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function destroy(Request $request, Attachment $attachment) public function destroy(Request $request, Attachment $attachment)
{ {
@@ -129,6 +130,7 @@ class AttachmentController extends Controller
* @param Attachment $attachment * @param Attachment $attachment
* *
* @return View * @return View
* @throws \RuntimeException
*/ */
public function edit(Request $request, Attachment $attachment) public function edit(Request $request, Attachment $attachment)
{ {
@@ -152,6 +154,7 @@ class AttachmentController extends Controller
* @param Attachment $attachment * @param Attachment $attachment
* *
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
* @throws \RuntimeException
*/ */
public function update(AttachmentFormRequest $request, Attachment $attachment) public function update(AttachmentFormRequest $request, Attachment $attachment)
{ {

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

@@ -75,6 +75,7 @@ class BillController extends Controller
* @param Request $request * @param Request $request
* *
* @return View * @return View
* @throws \RuntimeException
*/ */
public function create(Request $request) public function create(Request $request)
{ {
@@ -113,6 +114,7 @@ class BillController extends Controller
* @param Bill $bill * @param Bill $bill
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function destroy(Request $request, BillRepositoryInterface $repository, Bill $bill) public function destroy(Request $request, BillRepositoryInterface $repository, Bill $bill)
{ {
@@ -130,6 +132,7 @@ class BillController extends Controller
* @param Bill $bill * @param Bill $bill
* *
* @return View * @return View
* @throws \RuntimeException
*/ */
public function edit(Request $request, Bill $bill) public function edit(Request $request, Bill $bill)
{ {
@@ -198,6 +201,7 @@ class BillController extends Controller
* @param Bill $bill * @param Bill $bill
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function rescan(Request $request, BillRepositoryInterface $repository, Bill $bill) public function rescan(Request $request, BillRepositoryInterface $repository, Bill $bill)
{ {
@@ -264,6 +268,7 @@ class BillController extends Controller
* @param BillRepositoryInterface $repository * @param BillRepositoryInterface $repository
* *
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
* @throws \RuntimeException
*/ */
public function store(BillFormRequest $request, BillRepositoryInterface $repository) public function store(BillFormRequest $request, BillRepositoryInterface $repository)
{ {
@@ -299,6 +304,7 @@ class BillController extends Controller
* @param Bill $bill * @param Bill $bill
* *
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
* @throws \RuntimeException
*/ */
public function update(BillFormRequest $request, BillRepositoryInterface $repository, Bill $bill) public function update(BillFormRequest $request, BillRepositoryInterface $repository, Bill $bill)
{ {

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

@@ -77,6 +77,7 @@ class CategoryController extends Controller
* @param Request $request * @param Request $request
* *
* @return View * @return View
* @throws \RuntimeException
*/ */
public function create(Request $request) public function create(Request $request)
{ {
@@ -109,6 +110,7 @@ class CategoryController extends Controller
* @param Category $category * @param Category $category
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function destroy(Request $request, Category $category) public function destroy(Request $request, Category $category)
{ {
@@ -126,6 +128,7 @@ class CategoryController extends Controller
* @param Category $category * @param Category $category
* *
* @return View * @return View
* @throws \RuntimeException
*/ */
public function edit(Request $request, Category $category) public function edit(Request $request, Category $category)
{ {
@@ -297,6 +300,7 @@ class CategoryController extends Controller
* @param CategoryRepositoryInterface $repository * @param CategoryRepositoryInterface $repository
* *
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function store(CategoryFormRequest $request, CategoryRepositoryInterface $repository) public function store(CategoryFormRequest $request, CategoryRepositoryInterface $repository)
{ {
@@ -323,6 +327,7 @@ class CategoryController extends Controller
* @param Category $category * @param Category $category
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function update(CategoryFormRequest $request, CategoryRepositoryInterface $repository, Category $category) public function update(CategoryFormRequest $request, CategoryRepositoryInterface $repository, Category $category)
{ {

8
app/Http/Controllers/CurrencyController.php
View File

@@ -67,6 +67,7 @@ class CurrencyController extends Controller
* @param Request $request * @param Request $request
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
* @throws \RuntimeException
*/ */
public function create(Request $request) public function create(Request $request)
{ {
@@ -93,6 +94,7 @@ class CurrencyController extends Controller
* @param TransactionCurrency $currency * @param TransactionCurrency $currency
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function defaultCurrency(Request $request, TransactionCurrency $currency) public function defaultCurrency(Request $request, TransactionCurrency $currency)
{ {
@@ -111,6 +113,7 @@ class CurrencyController extends Controller
* @param TransactionCurrency $currency * @param TransactionCurrency $currency
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
* @throws \RuntimeException
*/ */
public function delete(Request $request, TransactionCurrency $currency) public function delete(Request $request, TransactionCurrency $currency)
{ {
@@ -140,6 +143,7 @@ class CurrencyController extends Controller
* @param TransactionCurrency $currency * @param TransactionCurrency $currency
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function destroy(Request $request, TransactionCurrency $currency) public function destroy(Request $request, TransactionCurrency $currency)
{ {
@@ -168,6 +172,7 @@ class CurrencyController extends Controller
* @param TransactionCurrency $currency * @param TransactionCurrency $currency
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
* @throws \RuntimeException
*/ */
public function edit(Request $request, TransactionCurrency $currency) public function edit(Request $request, TransactionCurrency $currency)
{ {
@@ -196,6 +201,7 @@ class CurrencyController extends Controller
* @param Request $request * @param Request $request
* *
* @return View * @return View
* @throws \RuntimeException
*/ */
public function index(Request $request) public function index(Request $request)
{ {
@@ -226,6 +232,7 @@ class CurrencyController extends Controller
* @param CurrencyFormRequest $request * @param CurrencyFormRequest $request
* *
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function store(CurrencyFormRequest $request) public function store(CurrencyFormRequest $request)
{ {
@@ -257,6 +264,7 @@ class CurrencyController extends Controller
* @param TransactionCurrency $currency * @param TransactionCurrency $currency
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function update(CurrencyFormRequest $request, TransactionCurrency $currency) public function update(CurrencyFormRequest $request, TransactionCurrency $currency)
{ {

9
app/Http/Controllers/DebugController.php
View File

@@ -50,6 +50,7 @@ class DebugController extends Controller
* @param Request $request * @param Request $request
* *
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \InvalidArgumentException
*/ */
public function index(Request $request) public function index(Request $request)
{ {
@@ -57,11 +58,11 @@ class DebugController extends Controller
$replace = ['\~', '# ']; $replace = ['\~', '# '];
$phpVersion = str_replace($search, $replace, PHP_VERSION); $phpVersion = str_replace($search, $replace, PHP_VERSION);
$phpOs = str_replace($search, $replace, php_uname()); $phpOs = str_replace($search, $replace, PHP_OS);
$interface = PHP_SAPI; $interface = PHP_SAPI;
$now = Carbon::create()->format('Y-m-d H:i:s e'); $now = Carbon::create()->format('Y-m-d H:i:s e');
$extensions = join(', ', get_loaded_extensions()); $extensions = implode(', ', get_loaded_extensions());
$drivers = join(', ', DB::availableDrivers()); $drivers = implode(', ', DB::availableDrivers());
$currentDriver = DB::getDriverName(); $currentDriver = DB::getDriverName();
$userAgent = $request->header('user-agent'); $userAgent = $request->header('user-agent');
$isSandstorm = var_export(env('IS_SANDSTORM', 'unknown'), true); $isSandstorm = var_export(env('IS_SANDSTORM', 'unknown'), true);
@@ -98,6 +99,7 @@ class DebugController extends Controller
$logContent = file_get_contents($logFile); $logContent = file_get_contents($logFile);
} catch (Exception $e) { } catch (Exception $e) {
// don't care // don't care
Log::debug(sprintf('Could not read log file. %s', $e->getMessage()));
} }
} }
} }
@@ -110,7 +112,6 @@ class DebugController extends Controller
compact( compact(
'phpVersion', 'phpVersion',
'extensions', 'localeAttempts', 'extensions', 'localeAttempts',
'carbon',
'appEnv', 'appEnv',
'appDebug', 'appDebug',
'appLog', 'appLog',

1
app/Http/Controllers/ExportController.php
View File

@@ -111,6 +111,7 @@ class ExportController extends Controller
* @param ExportJobRepositoryInterface $jobs * @param ExportJobRepositoryInterface $jobs
* *
* @return View * @return View
* @throws \InvalidArgumentException
*/ */
public function index(AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs) public function index(AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs)
{ {

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

@@ -62,6 +62,7 @@ class HomeController extends Controller
* @param Request $request * @param Request $request
* *
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
* @throws \RuntimeException
*/ */
public function dateRange(Request $request) public function dateRange(Request $request)
{ {
@@ -116,6 +117,7 @@ class HomeController extends Controller
* @param Request $request * @param Request $request
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function flush(Request $request) public function flush(Request $request)
{ {
@@ -132,6 +134,7 @@ class HomeController extends Controller
Artisan::call('twig:clean'); Artisan::call('twig:clean');
} catch (Exception $e) { } catch (Exception $e) {
// dont care // dont care
Log::debug('Called twig:clean.');
} }
Log::debug('Call view:clear...'); Log::debug('Call view:clear...');
Artisan::call('view:clear'); Artisan::call('view:clear');
@@ -229,6 +232,7 @@ class HomeController extends Controller
* @param Request $request * @param Request $request
* *
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function testFlash(Request $request) public function testFlash(Request $request)
{ {

1
app/Http/Controllers/JavascriptController.php
View File

@@ -92,6 +92,7 @@ class JavascriptController extends Controller
* @param CurrencyRepositoryInterface $currencyRepository * @param CurrencyRepositoryInterface $currencyRepository
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
* @throws \RuntimeException
*/ */
public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository) public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository)
{ {

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

@@ -251,7 +251,7 @@ class PiggyBankController extends Controller
if (is_array($data)) { if (is_array($data)) {
foreach ($data as $order => $id) { foreach ($data as $order => $id) {
$repository->setOrder(intval($id), ($order + 1)); $repository->setOrder(intval($id), $order + 1);
} }
} }

1
app/Http/Controllers/ProfileController.php
View File

@@ -218,6 +218,7 @@ class ProfileController extends Controller
* @param UserRepositoryInterface $repository * @param UserRepositoryInterface $repository
* *
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \RuntimeException
*/ */
public function postChangeEmail(EmailFormRequest $request, UserRepositoryInterface $repository) public function postChangeEmail(EmailFormRequest $request, UserRepositoryInterface $repository)
{ {

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

@@ -101,9 +101,8 @@ class ReportController extends Controller
$generator = ReportGeneratorFactory::reportGenerator('Account', $start, $end); $generator = ReportGeneratorFactory::reportGenerator('Account', $start, $end);
$generator->setAccounts($accounts); $generator->setAccounts($accounts);
$generator->setExpense($expense); $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 = ReportGeneratorFactory::reportGenerator('Audit', $start, $end);
$generator->setAccounts($accounts); $generator->setAccounts($accounts);
$result = $generator->generate();
return $result; return $generator->generate();
} }
/** /**

3
app/Http/Controllers/RuleController.php
View File

@@ -311,6 +311,7 @@ class RuleController extends Controller
* @param Rule $rule * @param Rule $rule
* *
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \InvalidArgumentException
*/ */
public function selectTransactions(AccountRepositoryInterface $repository, Rule $rule) public function selectTransactions(AccountRepositoryInterface $repository, Rule $rule)
{ {
@@ -677,7 +678,7 @@ class RuleController extends Controller
$triggers[] = [ $triggers[] = [
'type' => $triggerType, 'type' => $triggerType,
'value' => $data['rule-trigger-values'][$index], 'value' => $data['rule-trigger-values'][$index],
'stopProcessing' => 1 === intval($data['rule-trigger-stop'][$index]) ? true : false, 'stopProcessing' => 1 === (int)$data['rule-trigger-stop'][$index],
]; ];
} }
} }

1
app/Http/Controllers/RuleGroupController.php
View File

@@ -184,6 +184,7 @@ class RuleGroupController extends Controller
* @param RuleGroup $ruleGroup * @param RuleGroup $ruleGroup
* *
* @return View * @return View
* @throws \InvalidArgumentException
*/ */
public function selectTransactions(AccountRepositoryInterface $repository, RuleGroup $ruleGroup) public function selectTransactions(AccountRepositoryInterface $repository, RuleGroup $ruleGroup)
{ {

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

@@ -333,8 +333,8 @@ class TagController extends Controller
'string' => $end->format('Y-m-d'), 'string' => $end->format('Y-m-d'),
'name' => app('navigation')->periodShow($end, $range), 'name' => app('navigation')->periodShow($end, $range),
'date' => clone $end, 'date' => clone $end,
'spent' => $this->repository->spentInperiod($tag, $end, $currentEnd), 'spent' => $this->repository->spentInPeriod($tag, $end, $currentEnd),
'earned' => $this->repository->earnedInperiod($tag, $end, $currentEnd), 'earned' => $this->repository->earnedInPeriod($tag, $end, $currentEnd),
]; ];
$collection->push($arr); $collection->push($arr);

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

@@ -113,37 +113,6 @@ class TransactionController extends Controller
$transactions->setPath($path); $transactions->setPath($path);
return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'transactions', 'periods', 'start', 'end')); 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 string $what
* *
* @param Carbon $date
*
* @return Collection * @return Collection
*/ */
private function getPeriodOverview(string $what, Carbon $date): Collection private function getPeriodOverview(string $what, Carbon $date): Collection
{ {
$range = Preferences::get('viewRange', '1M')->data; $range = Preferences::get('viewRange', '1M')->data;
$first = $this->repository->first(); $first = $this->repository->first();
$start = (new Carbon)->subYear(); $start = new Carbon;
$start->subYear();
$types = config('firefly.transactionTypesByWhat.' . $what); $types = config('firefly.transactionTypesByWhat.' . $what);
$entries = new Collection; $entries = new Collection;
if (null !== $first) { if (null !== $first) {
@@ -280,6 +252,7 @@ class TransactionController extends Controller
if ($date < $start) { if ($date < $start) {
list($start, $date) = [$date, $start]; // @codeCoverageIgnore list($start, $date) = [$date, $start]; // @codeCoverageIgnore
} }
/** @var array $dates */ /** @var array $dates */
$dates = app('navigation')->blockPeriods($start, $date, $range); $dates = app('navigation')->blockPeriods($start, $date, $range);