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

Various PSR12 code cleanup

Browse Source
This commit is contained in:
James Cole
2022-12-29 19:41:57 +01:00
parent 0022009dd5
commit dbf3e76ecc
340 changed files with 4079 additions and 3816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/Data/Bulk/AccountController.php
View File

@@ -58,7 +58,7 @@ class AccountController extends Controller
/**
* This endpoint is deprecated and not documented.
*
* @param MoveTransactionsRequest $request
* @param MoveTransactionsRequest $request
*
* @return JsonResponse
* @deprecated

8
app/Api/V1/Controllers/Data/Bulk/TransactionController.php
View File

@@ -63,7 +63,7 @@ class TransactionController extends Controller
/**
* This endpoint is documented at:
*
* @param TransactionRequest $request
* @param TransactionRequest $request
*
* @return JsonResponse
*/
@@ -76,8 +76,8 @@ class TransactionController extends Controller
// to respond to what is in the $query.
// this is OK because only one thing can be in the query at the moment.
if ($this->updatesTransactionAccount($params)) {
$original = $this->repository->find((int) $params['where']['account_id']);
$destination = $this->repository->find((int) $params['update']['account_id']);
$original = $this->repository->find((int)$params['where']['account_id']);
$destination = $this->repository->find((int)$params['update']['account_id']);
/** @var AccountDestroyService $service */
$service = app(AccountDestroyService::class);
@@ -88,7 +88,7 @@ class TransactionController extends Controller
}
/**
* @param array $params
* @param array $params
*
* @return bool
*/

31
app/Api/V1/Controllers/Data/DestroyController.php
View File

@@ -58,7 +58,7 @@ class DestroyController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/destroyData
*
* @param DestroyRequest $request
* @param DestroyRequest $request
*
* @return JsonResponse
* @throws FireflyException
@@ -97,24 +97,32 @@ class DestroyController extends Controller
case 'accounts':
$this->destroyAccounts(
[
AccountType::ASSET, AccountType::DEFAULT,
AccountType::BENEFICIARY, AccountType::EXPENSE,
AccountType::REVENUE, AccountType::INITIAL_BALANCE,
AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
AccountType::ASSET,
AccountType::DEFAULT,
AccountType::BENEFICIARY,
AccountType::EXPENSE,
AccountType::REVENUE,
AccountType::INITIAL_BALANCE,
AccountType::DEBT,
AccountType::LOAN,
AccountType::MORTGAGE,
AccountType::CREDITCARD,
]
);
break;
case 'asset_accounts':
$this->destroyAccounts(
[
AccountType::ASSET, AccountType::DEFAULT,
AccountType::ASSET,
AccountType::DEFAULT,
]
);
break;
case 'expense_accounts':
$this->destroyAccounts(
[
AccountType::BENEFICIARY, AccountType::EXPENSE,
AccountType::BENEFICIARY,
AccountType::EXPENSE,
]
);
break;
@@ -128,7 +136,10 @@ class DestroyController extends Controller
case 'liabilities':
$this->destroyAccounts(
[
AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
AccountType::DEBT,
AccountType::LOAN,
AccountType::MORTGAGE,
AccountType::CREDITCARD,
]
);
break;
@@ -256,7 +267,7 @@ class DestroyController extends Controller
}
/**
* @param array $types
* @param array $types
*/
private function destroyAccounts(array $types): void
{
@@ -281,7 +292,7 @@ class DestroyController extends Controller
}
/**
* @param array $types
* @param array $types
*/
private function destroyTransactions(array $types): void
{

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

@@ -57,7 +57,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportAccounts
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -70,7 +70,7 @@ class ExportController extends Controller
}
/**
* @param string $key
* @param string $key
*
* @return LaravelResponse
* @throws FireflyException
@@ -86,13 +86,13 @@ class ExportController extends Controller
$response
->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $fileName)
->header('Content-Disposition', 'attachment; filename='.$fileName)
->header('Content-Transfer-Encoding', 'binary')
->header('Connection', 'Keep-Alive')
->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public')
->header('Content-Length', (string) strlen($data[$key]));
->header('Content-Length', (string)strlen($data[$key]));
return $response;
}
@@ -101,7 +101,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportBills
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -117,7 +117,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportBudgets
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -133,7 +133,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportCategories
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -149,7 +149,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportPiggies
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -165,7 +165,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportRecurring
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -181,7 +181,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportRules
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -197,7 +197,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportTags
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -213,7 +213,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportTransactions
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException

3
app/Api/V1/Controllers/Data/PurgeController.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Category;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\Recurrence;
use FireflyIII\Models\Rule;
@@ -58,7 +57,7 @@ class PurgeController extends Controller
// piggies
$set = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']);
->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']);
/** @var PiggyBank $piggy */
foreach ($set as $piggy) {
$piggy->forceDelete();