Various PSR12 code cleanup

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

View File

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\Transaction;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Events\DestroyedTransactionGroup;
use FireflyIII\Events\UpdatedAccount;
use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction;
@@ -41,8 +40,8 @@ use Log;
*/
class DestroyController extends Controller
{
private JournalRepositoryInterface $repository;
private TransactionGroupRepository $groupRepository;
private JournalRepositoryInterface $repository;
/**
* TransactionController constructor.
@@ -74,7 +73,7 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
* @param TransactionGroup $transactionGroup
* @param TransactionGroup $transactionGroup
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -114,7 +113,7 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
* @param TransactionJournal $transactionJournal
* @param TransactionJournal $transactionJournal
*
* @codeCoverageIgnore
* @return JsonResponse

View File

@@ -70,7 +70,7 @@ class ListController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/transactions/listAttachmentByTransaction
*
* @param TransactionGroup $transactionGroup
* @param TransactionGroup $transactionGroup
*
* @return JsonResponse
* @throws FireflyException
@@ -79,7 +79,7 @@ class ListController extends Controller
public function attachments(TransactionGroup $transactionGroup): JsonResponse
{
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = new Collection();
foreach ($transactionGroup->transactionJournals as $transactionJournal) {
$collection = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($collection);
@@ -90,7 +90,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.transactions.attachments', [$transactionGroup->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.transactions.attachments', [$transactionGroup->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class);
@@ -106,7 +106,7 @@ class ListController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/transactions/listEventByTransaction
*
* @param TransactionGroup $transactionGroup
* @param TransactionGroup $transactionGroup
*
* @return JsonResponse
* @throws FireflyException
@@ -116,7 +116,7 @@ class ListController extends Controller
{
$manager = $this->getManager();
$collection = new Collection();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
foreach ($transactionGroup->transactionJournals as $transactionJournal) {
$collection = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($collection);
}
@@ -124,7 +124,7 @@ class ListController extends Controller
$events = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.transactions.piggy_bank_events', [$transactionGroup->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.transactions.piggy_bank_events', [$transactionGroup->id]).$this->buildParams());
/** @var PiggyBankEventTransformer $transformer */
$transformer = app(PiggyBankEventTransformer::class);
@@ -145,7 +145,7 @@ class ListController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/transactions/listLinksByJournal
*
* @param TransactionJournal $transactionJournal
* @param TransactionJournal $transactionJournal
*
* @return JsonResponse
* @throws FireflyException
@@ -155,13 +155,13 @@ class ListController extends Controller
{
$manager = $this->getManager();
$collection = $this->journalAPIRepository->getJournalLinks($transactionJournal);
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$count = $collection->count();
$journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.transaction-journals.transaction_links', [$transactionJournal->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.transaction-journals.transaction_links', [$transactionJournal->id]).$this->buildParams());
/** @var TransactionLinkTransformer $transformer */
$transformer = app(TransactionLinkTransformer::class);

View File

@@ -51,7 +51,7 @@ class ShowController extends Controller
*
* Show all transactions.
*
* @param Request $request
* @param Request $request
*
* @return JsonResponse
* @throws FireflyException
@@ -59,7 +59,7 @@ class ShowController extends Controller
*/
public function index(Request $request): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);
@@ -85,7 +85,7 @@ class ShowController extends Controller
$collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
}
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
$paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
$transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */
@@ -104,7 +104,7 @@ class ShowController extends Controller
*
* Show a single transaction, by transaction journal.
*
* @param TransactionJournal $transactionJournal
* @param TransactionJournal $transactionJournal
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -120,7 +120,7 @@ class ShowController extends Controller
*
* Show a single transaction.
*
* @param TransactionGroup $transactionGroup
* @param TransactionGroup $transactionGroup
*
* @return JsonResponse
* @codeCoverageIgnore

View File

@@ -76,7 +76,7 @@ class StoreController extends Controller
*
* Store a new transaction.
*
* @param StoreRequest $request
* @param StoreRequest $request
*
* @return JsonResponse
* @throws FireflyException|ValidationException

View File

@@ -70,8 +70,8 @@ class UpdateController extends Controller
*
* Update a transaction.
*
* @param UpdateRequest $request
* @param TransactionGroup $transactionGroup
* @param UpdateRequest $request
* @param TransactionGroup $transactionGroup
*
* @return JsonResponse
*/