kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 16:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Optimize some code.

Browse Source
This commit is contained in:
James Cole
2018-07-17 22:21:03 +02:00
parent 9299efd086
commit b886cc1333
19 changed files with 194 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Chart/BudgetReportController.php
View File

@@ -131,6 +131,9 @@ class BudgetReportController extends Controller
* @param Carbon $end
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function mainChart(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): JsonResponse
{

27
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -60,6 +60,8 @@ class CategoryController extends Controller
* @param Category $category
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function all(CategoryRepositoryInterface $repository, AccountRepositoryInterface $accountRepository, Category $category): JsonResponse
{
@@ -69,13 +71,8 @@ class CategoryController extends Controller
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
}
$start = $repository->firstUseDate($category);
if (null === $start) {
$start = new Carbon; // @codeCoverageIgnore
}
$start = $repository->firstUseDate($category);
$start = $start ?? new Carbon;
$range = app('preferences')->get('viewRange', '1M')->data;
$start = app('navigation')->startOfPeriod($start, $range);
$end = new Carbon;
@@ -83,19 +80,15 @@ class CategoryController extends Controller
$chartData = [
[
'label' => (string)trans('firefly.spent'),
'entries' => [],
'type' => 'bar',
'entries' => [], 'type' => 'bar',
],
[
'label' => (string)trans('firefly.earned'),
'entries' => [],
'type' => 'bar',
'entries' => [], 'type' => 'bar',
],
[
'label' => (string)trans('firefly.sum'),
'entries' => [],
'type' => 'line',
'fill' => false,
'entries' => [], 'type' => 'line', 'fill' => false,
],
];
@@ -167,6 +160,8 @@ class CategoryController extends Controller
* @param Carbon $end
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function reportPeriod(Category $category, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -225,6 +220,8 @@ class CategoryController extends Controller
* @param Carbon $end
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function reportPeriodNoCategory(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -297,6 +294,8 @@ class CategoryController extends Controller
* @param Carbon $end
*
* @return array
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
private function makePeriodChart(Category $category, Carbon $start, Carbon $end): array
{

13
app/Http/Controllers/Chart/CategoryReportController.php
View File

@@ -72,6 +72,8 @@ class CategoryReportController extends Controller
* @param string $others
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function accountExpense(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others): JsonResponse
{
@@ -94,6 +96,8 @@ class CategoryReportController extends Controller
* @param string $others
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function accountIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others): JsonResponse
{
@@ -119,6 +123,8 @@ class CategoryReportController extends Controller
* @param string $others
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function categoryExpense(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others): JsonResponse
{
@@ -144,6 +150,7 @@ class CategoryReportController extends Controller
* @param string $others
*
* @return JsonResponse
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function categoryIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end, string $others): JsonResponse
{
@@ -169,6 +176,10 @@ class CategoryReportController extends Controller
* @param Carbon $end
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function mainChart(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): JsonResponse
{
@@ -276,6 +287,8 @@ class CategoryReportController extends Controller
* @param Carbon $end
*
* @return Collection
*
*
*/
private function getExpenses(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): Collection
{

5
app/Http/Controllers/Chart/ExpenseReportController.php
View File

@@ -64,6 +64,7 @@ class ExpenseReportController extends Controller
);
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $expense
@@ -71,6 +72,10 @@ class ExpenseReportController extends Controller
* @param Carbon $end
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function mainChart(Collection $accounts, Collection $expense, Carbon $start, Carbon $end): JsonResponse
{

3
app/Http/Controllers/Chart/PiggyBankController.php
View File

@@ -59,6 +59,9 @@ class PiggyBankController extends Controller
* @param PiggyBank $piggyBank
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank): JsonResponse
{

8
app/Http/Controllers/Chart/ReportController.php
View File

@@ -94,6 +94,8 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return \Illuminate\Http\JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function operations(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -123,7 +125,6 @@ class ReportController extends Controller
'entries' => [],
],
];
foreach ($source['earned'] as $date => $amount) {
$carbon = new Carbon($date);
$label = $carbon->formatLocalized($format);
@@ -151,6 +152,9 @@ class ReportController extends Controller
* @param Collection $accounts
*
* @return \Illuminate\Http\JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function sum(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -238,6 +242,8 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return array
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
private function getChartData(Collection $accounts, Carbon $start, Carbon $end): array
{

29
app/Http/Controllers/Chart/TagReportController.php
View File

@@ -57,6 +57,7 @@ class TagReportController extends Controller
$this->generator = app(GeneratorInterface::class);
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $tags
@@ -65,6 +66,8 @@ class TagReportController extends Controller
* @param string $others
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function accountExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others): JsonResponse
{
@@ -81,6 +84,7 @@ class TagReportController extends Controller
return response()->json($data);
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $tags
@@ -89,6 +93,8 @@ class TagReportController extends Controller
* @param string $others
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function accountIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others): JsonResponse
{
@@ -105,6 +111,7 @@ class TagReportController extends Controller
return response()->json($data);
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $tags
@@ -112,6 +119,8 @@ class TagReportController extends Controller
* @param Carbon $end
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function budgetExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): JsonResponse
{
@@ -128,6 +137,7 @@ class TagReportController extends Controller
return response()->json($data);
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $tags
@@ -135,6 +145,8 @@ class TagReportController extends Controller
* @param Carbon $end
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function categoryExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): JsonResponse
{
@@ -151,6 +163,7 @@ class TagReportController extends Controller
return response()->json($data);
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $tags
@@ -158,6 +171,10 @@ class TagReportController extends Controller
* @param Carbon $end
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function mainChart(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): JsonResponse
{
@@ -257,6 +274,7 @@ class TagReportController extends Controller
return response()->json($data);
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $tags
@@ -265,6 +283,8 @@ class TagReportController extends Controller
* @param string $others
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function tagExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others): JsonResponse
{
@@ -281,6 +301,7 @@ class TagReportController extends Controller
return response()->json($data);
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $tags
@@ -289,6 +310,8 @@ class TagReportController extends Controller
* @param string $others
*
* @return JsonResponse
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function tagIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others): JsonResponse
{
@@ -305,6 +328,7 @@ class TagReportController extends Controller
return response()->json($data);
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $tags
@@ -312,6 +336,8 @@ class TagReportController extends Controller
* @param Carbon $end
*
* @return Collection
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
private function getExpenses(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection
{
@@ -327,6 +353,7 @@ class TagReportController extends Controller
return $collector->getJournals();
}
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param Collection $accounts
* @param Collection $tags
@@ -334,6 +361,8 @@ class TagReportController extends Controller
* @param Carbon $end
*
* @return Collection
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
private function getIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection
{