IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole 2021-05-24 08:22:41 +02:00
parent 2bff7750b4
commit 3ec9753808
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
41 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V1/Controllers/Chart/AccountController.php
View File

@ -114,7 +114,6 @@ class AccountController extends Controller
'yAxisID' => 0, // 0, 1, 2
'entries' => [],
];
/** @var Carbon $currentStart */
$currentStart = clone $start;
$range = app('steam')->balanceInRange($account, $start, clone $end);
$previous = round((float)array_values($range)[0], 12);

4
app/Api/V1/Controllers/Controller.php
View File

@ -109,9 +109,7 @@ abstract class Controller extends BaseController
}
// sort fields:
$bag = $this->getSortParameters($bag);
return $bag;
return $this->getSortParameters($bag);
}
/**

2
app/Api/V1/Controllers/Data/Export/ExportController.php
View File

@ -70,6 +70,8 @@ class ExportController extends Controller
*
* @return LaravelResponse
* @throws CannotInsertRecord
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \League\Csv\Exception
*/
private function returnExport(string $key): LaravelResponse
{

4
app/Api/V1/Controllers/Insight/Expense/BudgetController.php
View File

@ -81,7 +81,7 @@ class BudgetController extends Controller
}
/** @var Budget $budget */
foreach ($budgets as $budget) {
$expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection([$budget]), null);
$expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection([$budget]));
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
@ -109,7 +109,7 @@ class BudgetController extends Controller
$end = $request->getEnd();
$assetAccounts = $request->getAssetAccounts();
$result = [];
$expenses = $this->noRepository->sumExpenses($start, $end, $assetAccounts, null);
$expenses = $this->noRepository->sumExpenses($start, $end, $assetAccounts);
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [

3
app/Api/V1/Controllers/Models/Account/ListController.php
View File

@ -72,6 +72,7 @@ class ListController extends Controller
* @param Account $account
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function attachments(Account $account): JsonResponse
@ -103,6 +104,7 @@ class ListController extends Controller
* @param Account $account
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function piggyBanks(Account $account): JsonResponse
@ -142,6 +144,7 @@ class ListController extends Controller
* @param Account $account
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function transactions(Request $request, Account $account): JsonResponse
{

3
app/Api/V1/Controllers/Models/Account/ShowController.php
View File

@ -69,8 +69,9 @@ class ShowController extends Controller
*
* @param Request $request
*
* @codeCoverageIgnore
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(Request $request): JsonResponse
{

1
app/Api/V1/Controllers/Models/Attachment/ShowController.php
View File

@ -111,6 +111,7 @@ class ShowController extends Controller
* Display a listing of the resource.
*
* @return JsonResponse
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

1
app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php
View File

@ -65,6 +65,7 @@ class ShowController extends Controller
* Display a listing of the resource.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

3
app/Api/V1/Controllers/Models/Bill/ListController.php
View File

@ -71,6 +71,7 @@ class ListController extends Controller
* @param Bill $bill
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function attachments(Bill $bill): JsonResponse
@ -102,6 +103,7 @@ class ListController extends Controller
* @param Bill $bill
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function rules(Bill $bill): JsonResponse
@ -138,6 +140,7 @@ class ListController extends Controller
* @param Bill $bill
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Bill $bill): JsonResponse

1
app/Api/V1/Controllers/Models/Bill/ShowController.php
View File

@ -63,6 +63,7 @@ class ShowController extends Controller
* Display a listing of the resource.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

3
app/Api/V1/Controllers/Models/Budget/ListController.php
View File

@ -73,6 +73,7 @@ class ListController extends Controller
* @param Budget $budget
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function attachments(Budget $budget): JsonResponse
@ -104,6 +105,7 @@ class ListController extends Controller
* @param Budget $budget
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function budgetLimits(Budget $budget): JsonResponse
@ -134,6 +136,7 @@ class ListController extends Controller
* @param Budget $budget
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Budget $budget): JsonResponse

1
app/Api/V1/Controllers/Models/Budget/ShowController.php
View File

@ -66,6 +66,7 @@ class ShowController extends Controller
* Display a listing of the resource.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

1
app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php
View File

@ -65,6 +65,7 @@ class DestroyController extends Controller
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
* @throws FireflyException
* @codeCoverageIgnore
*/
public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse

1
app/Api/V1/Controllers/Models/BudgetLimit/ListController.php
View File

@ -73,6 +73,7 @@ class ListController extends Controller
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse

4
app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php
View File

@ -73,8 +73,10 @@ class ShowController extends Controller
* Display a listing of the budget limits for this budget..
*
* @param Request $request
* @param Budget $budget
*
* @return JsonResponse
* @throws FireflyException
* @codeCoverageIgnore
*/
public function index(Request $request, Budget $budget): JsonResponse
@ -104,6 +106,7 @@ class ShowController extends Controller
* @param DateRequest $request
*
* @return JsonResponse
* @throws FireflyException
* @codeCoverageIgnore
*/
public function indexAll(DateRequest $request): JsonResponse
@ -133,6 +136,7 @@ class ShowController extends Controller
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
* @throws FireflyException
*/
public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{

3
app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
View File

@ -64,10 +64,9 @@ class StoreController extends Controller
* Store a newly created resource in storage.
*
* @param StoreRequest $request
* @param Budget $budget
*
* @return JsonResponse
* @throws FireflyException
*
*/
public function store(StoreRequest $request, Budget $budget): JsonResponse
{

1
app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php
View File

@ -69,6 +69,7 @@ class UpdateController extends Controller
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
* @throws FireflyException
*/
public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{

2
app/Api/V1/Controllers/Models/Category/ListController.php
View File

@ -68,6 +68,7 @@ class ListController extends Controller
* @param Category $category
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function attachments(Category $category): JsonResponse
@ -101,6 +102,7 @@ class ListController extends Controller
* @param Category $category
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Category $category): JsonResponse

1
app/Api/V1/Controllers/Models/Category/ShowController.php
View File

@ -63,6 +63,7 @@ class ShowController extends Controller
* Display a listing of the resource.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

2
app/Api/V1/Controllers/Models/ObjectGroup/ListController.php
View File

@ -67,6 +67,7 @@ class ListController extends Controller
* @param ObjectGroup $objectGroup
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function bills(ObjectGroup $objectGroup): JsonResponse
@ -99,6 +100,7 @@ class ListController extends Controller
* @param ObjectGroup $objectGroup
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function piggyBanks(ObjectGroup $objectGroup): JsonResponse

3
app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php
View File

@ -67,8 +67,9 @@ class ShowController extends Controller
*
* @param Request $request
*
* @codeCoverageIgnore
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(Request $request): JsonResponse
{

2
app/Api/V1/Controllers/Models/PiggyBank/ListController.php
View File

@ -62,6 +62,7 @@ class ListController extends Controller
* @param PiggyBank $piggyBank
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function attachments(PiggyBank $piggyBank): JsonResponse
@ -93,6 +94,7 @@ class ListController extends Controller
* @param PiggyBank $piggyBank
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse

1
app/Api/V1/Controllers/Models/PiggyBank/ShowController.php
View File

@ -62,6 +62,7 @@ class ShowController extends Controller
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

1
app/Api/V1/Controllers/Models/Recurrence/ListController.php
View File

@ -69,6 +69,7 @@ class ListController extends Controller
* @param Recurrence $recurrence
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Recurrence $recurrence): JsonResponse

1
app/Api/V1/Controllers/Models/Recurrence/ShowController.php
View File

@ -63,6 +63,7 @@ class ShowController extends Controller
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

1
app/Api/V1/Controllers/Models/Rule/ShowController.php
View File

@ -66,6 +66,7 @@ class ShowController extends Controller
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

1
app/Api/V1/Controllers/Models/RuleGroup/ListController.php
View File

@ -65,6 +65,7 @@ class ListController extends Controller
* @param RuleGroup $group
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function rules(RuleGroup $group): JsonResponse

1
app/Api/V1/Controllers/Models/RuleGroup/ShowController.php
View File

@ -66,6 +66,7 @@ class ShowController extends Controller
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

2
app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php
View File

@ -77,7 +77,6 @@ class TriggerController extends Controller
*/
public function testGroup(TestRequest $request, RuleGroup $group): JsonResponse
{
/** @var Collection $rules */
$rules = $this->ruleGroupRepository->getActiveRules($group);
if (0 === $rules->count()) {
throw new FireflyException('200023: No rules in this rule group.');
@ -132,7 +131,6 @@ class TriggerController extends Controller
*/
public function triggerGroup(TriggerRequest $request, RuleGroup $group): JsonResponse
{
/** @var Collection $rules */
$rules = $this->ruleGroupRepository->getActiveRules($group);
if (0 === $rules->count()) {
throw new FireflyException('200023: No rules in this rule group.');

2
app/Api/V1/Controllers/Models/Tag/ListController.php
View File

@ -71,6 +71,7 @@ class ListController extends Controller
* @param Tag $tag
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function attachments(Tag $tag): JsonResponse
@ -103,6 +104,7 @@ class ListController extends Controller
* @param Tag $tag
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, Tag $tag): JsonResponse

1
app/Api/V1/Controllers/Models/Tag/ShowController.php
View File

@ -66,6 +66,7 @@ class ShowController extends Controller
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

3
app/Api/V1/Controllers/Models/Transaction/ListController.php
View File

@ -69,6 +69,7 @@ class ListController extends Controller
* @param TransactionGroup $transactionGroup
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function attachments(TransactionGroup $transactionGroup): JsonResponse
@ -101,6 +102,7 @@ class ListController extends Controller
* @param TransactionGroup $transactionGroup
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse
@ -136,6 +138,7 @@ class ListController extends Controller
* @param TransactionJournal $transactionJournal
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse

1
app/Api/V1/Controllers/Models/Transaction/ShowController.php
View File

@ -50,6 +50,7 @@ class ShowController extends Controller
* @param Request $request
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(Request $request): JsonResponse

7
app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
View File

@ -93,6 +93,7 @@ class ListController extends Controller
* @param TransactionCurrency $currency
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function accounts(Request $request, TransactionCurrency $currency): JsonResponse
@ -143,6 +144,7 @@ class ListController extends Controller
* @param TransactionCurrency $currency
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function availableBudgets(TransactionCurrency $currency): JsonResponse
@ -178,6 +180,7 @@ class ListController extends Controller
* @param TransactionCurrency $currency
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function bills(TransactionCurrency $currency): JsonResponse
@ -218,6 +221,7 @@ class ListController extends Controller
* @param TransactionCurrency $currency
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function budgetLimits(TransactionCurrency $currency): JsonResponse
@ -249,6 +253,7 @@ class ListController extends Controller
* @param TransactionCurrency $currency
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function recurrences(TransactionCurrency $currency): JsonResponse
@ -299,6 +304,7 @@ class ListController extends Controller
* @param TransactionCurrency $currency
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function rules(TransactionCurrency $currency): JsonResponse
@ -350,6 +356,7 @@ class ListController extends Controller
* @param TransactionCurrency $currency
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, TransactionCurrency $currency): JsonResponse

1
app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php
View File

@ -68,6 +68,7 @@ class ShowController extends Controller
* Display a listing of the resource.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

1
app/Api/V1/Controllers/Models/TransactionLink/ShowController.php
View File

@ -68,6 +68,7 @@ class ShowController extends Controller
* @param Request $request
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(Request $request): JsonResponse

1
app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php
View File

@ -71,7 +71,6 @@ class UpdateController extends Controller
* @param TransactionJournalLink $journalLink
*
* @return JsonResponse
* @throws FireflyException
*
* TODO generates query exception when link exists.
*/

1
app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php
View File

@ -75,6 +75,7 @@ class ListController extends Controller
* @param LinkType $linkType
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function transactions(Request $request, LinkType $linkType): JsonResponse

1
app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php
View File

@ -72,6 +72,7 @@ class ShowController extends Controller
* List all of them.
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @codeCoverageIgnore
*/
public function index(): JsonResponse

1
app/Api/V1/Controllers/Search/TransactionController.php
View File

@ -42,6 +42,7 @@ class TransactionController extends Controller
* @param SearchInterface $searcher
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function search(Request $request, SearchInterface $searcher): JsonResponse
{

6
app/User.php
View File

@ -132,10 +132,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property-read int|null $transaction_groups_count
* @property-read int|null $transaction_journals_count
* @property-read int|null $transactions_count
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\User whereMfaSecret($value)
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\User whereObjectguid($value)
* @method static Builder|User whereMfaSecret($value)
* @method static Builder|User whereObjectguid($value)
* @property string|null $provider
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\User whereProvider($value)
* @method static Builder|User whereProvider($value)
* @property-read \Illuminate\Database\Eloquent\Collection|ObjectGroup[] $objectGroups
* @property-read int|null $object_groups_count
* @property-read \Illuminate\Database\Eloquent\Collection|Webhook[] $webhooks