kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-28 18:51:55 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2018-08-04 17:30:06 +02:00
parent 5af026674f
commit f0d3ca5d53
88 changed files with 552 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Budget/ShowController.php
View File

@@ -142,7 +142,7 @@ class ShowController extends Controller
public function show(Request $request, Budget $budget)
{
/** @var Carbon $start */
$start = session('first', Carbon::create()->startOfYear());
$start = session('first', Carbon::now()->startOfYear());
$end = new Carbon;
$page = (int)$request->get('page');
$pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
@@ -196,7 +196,7 @@ class ShowController extends Controller
$transactions = $collector->getPaginatedJournals();
$transactions->setPath(route('budgets.show', [$budget->id, $budgetLimit->id]));
/** @var Carbon $start */
$start = session('first', Carbon::create()->startOfYear());
$start = session('first', Carbon::now()->startOfYear());
$end = new Carbon;
$limits = $this->getLimits($budget, $start, $end);

4
app/Http/Controllers/Category/ShowController.php
View File

@@ -90,9 +90,9 @@ class ShowController extends Controller
{
Log::debug('Now in show()');
/** @var Carbon $start */
$start = $start ?? session('start', Carbon::create()->startOfMonth());
$start = $start ?? session('start', Carbon::now()->startOfMonth());
/** @var Carbon $end */
$end = $end ?? session('end', Carbon::create()->startOfMonth());
$end = $end ?? session('end', Carbon::now()->startOfMonth());
$subTitleIcon = 'fa-bar-chart';
$moment = '';
$page = (int)$request->get('page');

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

@@ -120,7 +120,7 @@ class DebugController extends Controller
$phpVersion = str_replace($search, $replace, PHP_VERSION);
$phpOs = str_replace($search, $replace, PHP_OS);
$interface = PHP_SAPI;
$now = Carbon::create()->format('Y-m-d H:i:s e');
$now = Carbon::now()->format('Y-m-d H:i:s e');
$extensions = implode(', ', get_loaded_extensions());
$drivers = implode(', ', DB::availableDrivers());
$currentDriver = DB::getDriverName();

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

@@ -125,7 +125,7 @@ class ExportController extends Controller
$formats = array_keys(config('firefly.export_formats'));
$defaultFormat = app('preferences')->get('export_format', config('firefly.default_export_format'))->data;
$first = session('first')->format('Y-m-d');
$today = Carbon::create()->format('Y-m-d');
$today = Carbon::now()->format('Y-m-d');
return view('export.index', compact('job', 'formats', 'defaultFormat', 'first', 'today'));
}

2
app/Http/Controllers/Import/CallbackController.php
View File

@@ -36,6 +36,8 @@ class CallbackController extends Controller
{
/**
* Callback specifically for YNAB logins.
*
* @param Request $request
*
* @param ImportJobRepositoryInterface $repository

2
app/Http/Controllers/Import/IndexController.php
View File

@@ -37,7 +37,7 @@ use Log;
*/
class IndexController extends Controller
{
/** @var array */
/** @var array All available providers */
public $providers;
/** @var ImportJobRepositoryInterface The import job repository */
public $repository;

10
app/Http/Controllers/Json/FrontpageController.php
View File

@@ -26,6 +26,8 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Http\JsonResponse;
use Log;
use Throwable;
/**
* Class FrontpageController.
@@ -38,7 +40,6 @@ class FrontpageController extends Controller
* @param PiggyBankRepositoryInterface $repository
*
* @return JsonResponse
* @throws \Throwable
*/
public function piggyBanks(PiggyBankRepositoryInterface $repository): JsonResponse
{
@@ -64,7 +65,12 @@ class FrontpageController extends Controller
}
$html = '';
if (\count($info) > 0) {
$html = view('json.piggy-banks', compact('info'))->render();
try {
$html = view('json.piggy-banks', compact('info'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));
$html = 'Could not render view.';
}
}
return response()->json(['html' => $html]);

18
app/Http/Controllers/JsonController.php
View File

@@ -24,6 +24,8 @@ namespace FireflyIII\Http\Controllers;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Log;
use Throwable;
/**
* Class JsonController.
@@ -36,7 +38,6 @@ class JsonController extends Controller
* @param Request $request
*
* @return JsonResponse
* @throws \Throwable
*/
public function action(Request $request): JsonResponse
{
@@ -46,7 +47,12 @@ class JsonController extends Controller
foreach ($keys as $key) {
$actions[$key] = (string)trans('firefly.rule_action_' . $key . '_choice');
}
$view = view('rules.partials.action', compact('actions', 'count'))->render();
try {
$view = view('rules.partials.action', compact('actions', 'count'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));
$view = 'Could not render view.';
}
return response()->json(['html' => $view]);
}
@@ -57,7 +63,6 @@ class JsonController extends Controller
* @param Request $request
*
* @return JsonResponse
* @throws \Throwable
*/
public function trigger(Request $request): JsonResponse
{
@@ -71,7 +76,12 @@ class JsonController extends Controller
}
asort($triggers);
$view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
try {
$view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage()));
$view = 'Could not render view.';
}
return response()->json(['html' => $view]);
}

4
app/Http/Controllers/Popup/ReportController.php
View File

@@ -274,7 +274,7 @@ class ReportController extends Controller
$attributes['startDate'] = Carbon::createFromFormat('Ymd', $attributes['startDate']);
} catch (InvalidArgumentException $e) {
Log::debug(sprintf('Not important error message: %s', $e->getMessage()));
$date = Carbon::create()->startOfMonth();
$date = Carbon::now()->startOfMonth();
$attributes['startDate'] = $date;
}
@@ -282,7 +282,7 @@ class ReportController extends Controller
$attributes['endDate'] = Carbon::createFromFormat('Ymd', $attributes['endDate']);
} catch (InvalidArgumentException $e) {
Log::debug(sprintf('Not important error message: %s', $e->getMessage()));
$date = Carbon::create()->startOfMonth();
$date = Carbon::now()->startOfMonth();
$attributes['endDate'] = $date;
}

2
app/Http/Controllers/Report/OperationsController.php
View File

@@ -38,7 +38,7 @@ class OperationsController extends Controller
private $tasker;
/**
*
* OperationsController constructor.
*/
public function __construct()
{

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

@@ -36,6 +36,7 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Collection;
use Log;
use Throwable;
/**
* Class ReportController.
@@ -277,7 +278,6 @@ class ReportController extends Controller
*
* @return mixed
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @throws \Throwable
*/
public function options(string $reportType)
{
@@ -391,7 +391,6 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View|string
*
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
@@ -423,7 +422,6 @@ class ReportController extends Controller
* Get options for account report.
*
* @return string
* @throws \Throwable
*/
private function accountReportOptions(): string
{
@@ -438,52 +436,77 @@ class ReportController extends Controller
$set->push($exp);
}
}
try {
$result = view('reports.options.account', compact('set'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
$result = 'Could not render view.';
}
return view('reports.options.account', compact('set'))->render();
return $result;
}
/**
* Get options for budget report.
*
* @return string
* @throws \Throwable
*/
private function budgetReportOptions(): string
{
/** @var BudgetRepositoryInterface $repository */
$repository = app(BudgetRepositoryInterface::class);
$budgets = $repository->getBudgets();
try {
$result = view('reports.options.budget', compact('budgets'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
$result = 'Could not render view.';
}
return view('reports.options.budget', compact('budgets'))->render();
return $result;
}
/**
* Get options for category report.
*
* @return string
* @throws \Throwable
*/
private function categoryReportOptions(): string
{
/** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class);
$categories = $repository->getCategories();
try {
$result = view('reports.options.category', compact('categories'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.category: %s', $e->getMessage()));
$result = 'Could not render view.';
}
return view('reports.options.category', compact('categories'))->render();
return $result;
}
/**
* Get options for default report.
*
* @return string
* @throws \Throwable
*/
private function noReportOptions(): string
{
return view('reports.options.no-options')->render();
try {
$result = view('reports.options.no-options')->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.no-options: %s', $e->getMessage()));
$result = 'Could not render view.';
}
return $result;
}
/**
* Get options for tag report.
*
* @return string
* @throws \Throwable
*/
private function tagReportOptions(): string
{
@@ -494,7 +517,13 @@ class ReportController extends Controller
return $tag->tag;
}
);
try {
$result = view('reports.options.tag', compact('tags'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
$result = 'Could not render view.';
}
return view('reports.options.tag', compact('tags'))->render();
return $result;
}
}

2
app/Http/Controllers/Rule/SelectController.php
View File

@@ -118,7 +118,7 @@ class SelectController extends Controller
{
// does the user have shared accounts?
$first = session('first')->format('Y-m-d');
$today = Carbon::create()->format('Y-m-d');
$today = Carbon::now()->format('Y-m-d');
$subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]);
return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));

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

@@ -208,7 +208,7 @@ class RuleGroupController extends Controller
public function selectTransactions(RuleGroup $ruleGroup)
{
$first = session('first')->format('Y-m-d');
$today = Carbon::create()->format('Y-m-d');
$today = Carbon::now()->format('Y-m-d');
$subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
return view('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));

11
app/Http/Controllers/SearchController.php
View File

@@ -27,6 +27,8 @@ use FireflyIII\Support\Search\SearchInterface;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Log;
use Throwable;
/**
* Class SearchController.
@@ -77,7 +79,6 @@ class SearchController extends Controller
* @param SearchInterface $searcher
*
* @return \Illuminate\Http\JsonResponse
* @throws \Throwable
*/
public function search(Request $request, SearchInterface $searcher): JsonResponse
{
@@ -99,8 +100,12 @@ class SearchController extends Controller
$transactions = $searcher->searchTransactions();
$cache->store($transactions);
}
$html = view('search.search', compact('transactions'))->render();
try {
$html = view('search.search', compact('transactions'))->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render search.search: %s', $e->getMessage()));
$html = 'Could not render view.';
}
return response()->json(['count' => $transactions->count(), 'html' => $html]);
}

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

@@ -262,7 +262,7 @@ class TransactionController extends Controller
{
$range = app('preferences')->get('viewRange', '1M')->data;
$first = $this->repository->firstNull();
$start = Carbon::create()->subYear();
$start = Carbon::now()->subYear();
$types = config('firefly.transactionTypesByWhat.' . $what);
$entries = new Collection;
if (null !== $first) {