diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php
index e82c88dff6..b6e2c9315e 100644
--- a/app/Api/V1/Controllers/Autocomplete/AccountController.php
+++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php
@@ -41,7 +41,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class AccountController
*/
-class AccountController extends Controller
+final class AccountController extends Controller
{
use AccountFilter;
diff --git a/app/Api/V1/Controllers/Autocomplete/BillController.php b/app/Api/V1/Controllers/Autocomplete/BillController.php
index b43e56e1f2..c5b4318b64 100644
--- a/app/Api/V1/Controllers/Autocomplete/BillController.php
+++ b/app/Api/V1/Controllers/Autocomplete/BillController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
/**
* Class BillController
*/
-class BillController extends Controller
+final class BillController extends Controller
{
private BillRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_SUBSCRIPTIONS];
diff --git a/app/Api/V1/Controllers/Autocomplete/BudgetController.php b/app/Api/V1/Controllers/Autocomplete/BudgetController.php
index 40d42d5c18..2d6708e325 100644
--- a/app/Api/V1/Controllers/Autocomplete/BudgetController.php
+++ b/app/Api/V1/Controllers/Autocomplete/BudgetController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
/**
* Class BudgetController
*/
-class BudgetController extends Controller
+final class BudgetController extends Controller
{
private BudgetRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_BUDGETS];
diff --git a/app/Api/V1/Controllers/Autocomplete/CategoryController.php b/app/Api/V1/Controllers/Autocomplete/CategoryController.php
index 27fa145d52..adf2e5da03 100644
--- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php
+++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
/**
* Class CategoryController
*/
-class CategoryController extends Controller
+final class CategoryController extends Controller
{
private CategoryRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
diff --git a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
index 656c96b493..57be02eaa9 100644
--- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
+++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
@@ -37,7 +37,7 @@ use Illuminate\Http\Request;
/**
* Class CurrencyController
*/
-class CurrencyController extends Controller
+final class CurrencyController extends Controller
{
private CurrencyRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
diff --git a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
index 38b931377c..22ee0db1c3 100644
--- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
+++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
/**
* Class ObjectGroupController
*/
-class ObjectGroupController extends Controller
+final class ObjectGroupController extends Controller
{
private ObjectGroupRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
diff --git a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
index a7d54eff6b..123239d34c 100644
--- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
+++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
@@ -38,7 +38,7 @@ use Illuminate\Http\Request;
/**
* Class PiggyBankController
*/
-class PiggyBankController extends Controller
+final class PiggyBankController extends Controller
{
private AccountRepositoryInterface $accountRepository;
private PiggyBankRepositoryInterface $piggyRepository;
diff --git a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
index 2d243b4d2b..3eff1403ee 100644
--- a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
+++ b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
/**
* Class RecurrenceController
*/
-class RecurrenceController extends Controller
+final class RecurrenceController extends Controller
{
private RecurringRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_RECURRING];
diff --git a/app/Api/V1/Controllers/Autocomplete/RuleController.php b/app/Api/V1/Controllers/Autocomplete/RuleController.php
index d0a509156a..3575167b9e 100644
--- a/app/Api/V1/Controllers/Autocomplete/RuleController.php
+++ b/app/Api/V1/Controllers/Autocomplete/RuleController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
/**
* Class RuleController
*/
-class RuleController extends Controller
+final class RuleController extends Controller
{
private RuleRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_RULES];
diff --git a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
index 51acc4a3c2..75d6ad1f01 100644
--- a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
+++ b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
/**
* Class RuleGroupController
*/
-class RuleGroupController extends Controller
+final class RuleGroupController extends Controller
{
private RuleGroupRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_RULES];
diff --git a/app/Api/V1/Controllers/Autocomplete/TagController.php b/app/Api/V1/Controllers/Autocomplete/TagController.php
index 092549d02b..d62b8793e1 100644
--- a/app/Api/V1/Controllers/Autocomplete/TagController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TagController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
/**
* Class TagController
*/
-class TagController extends Controller
+final class TagController extends Controller
{
private TagRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.php
index 6f17845992..e02cb1a635 100644
--- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php
@@ -39,7 +39,7 @@ use Illuminate\Support\Collection;
/**
* Class TransactionController
*/
-class TransactionController extends Controller
+final class TransactionController extends Controller
{
protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
private TransactionGroupRepositoryInterface $groupRepository;
diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
index 98d635b2d8..c34cc83f93 100644
--- a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
/**
* Class TransactionTypeController
*/
-class TransactionTypeController extends Controller
+final class TransactionTypeController extends Controller
{
private TransactionTypeRepositoryInterface $repository;
protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php
index 9928197085..06380836b0 100644
--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -44,7 +44,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class AccountController
*/
-class AccountController extends Controller
+final class AccountController extends Controller
{
use ApiSupport;
use CleansChartData;
diff --git a/app/Api/V1/Controllers/Chart/BalanceController.php b/app/Api/V1/Controllers/Chart/BalanceController.php
index e65a3af8ad..995adf03b4 100644
--- a/app/Api/V1/Controllers/Chart/BalanceController.php
+++ b/app/Api/V1/Controllers/Chart/BalanceController.php
@@ -40,7 +40,7 @@ use Illuminate\Http\Request;
/**
* Class BalanceController
*/
-class BalanceController extends Controller
+final class BalanceController extends Controller
{
use CleansChartData;
use CollectsAccountsFromFilter;
diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.php
index 7f9670e56b..ccc2054345 100644
--- a/app/Api/V1/Controllers/Chart/BudgetController.php
+++ b/app/Api/V1/Controllers/Chart/BudgetController.php
@@ -47,7 +47,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class BudgetController
*/
-class BudgetController extends Controller
+final class BudgetController extends Controller
{
use CleansChartData;
use ValidatesUserGroupTrait;
diff --git a/app/Api/V1/Controllers/Chart/CategoryController.php b/app/Api/V1/Controllers/Chart/CategoryController.php
index 679dab4e5c..a7b17d2c94 100644
--- a/app/Api/V1/Controllers/Chart/CategoryController.php
+++ b/app/Api/V1/Controllers/Chart/CategoryController.php
@@ -45,7 +45,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class BudgetController
*/
-class CategoryController extends Controller
+final class CategoryController extends Controller
{
use CleansChartData;
use ValidatesUserGroupTrait;
diff --git a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php
index 38c615bd5b..91b671e9c9 100644
--- a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php
+++ b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php
@@ -42,7 +42,7 @@ use Illuminate\Http\Request;
* Because this is a security nightmare waiting to happen validation
* is pretty strict.
*/
-class TransactionController extends Controller
+final class TransactionController extends Controller
{
private AccountRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.php
index 3426201b4a..b7ecdf70df 100644
--- a/app/Api/V1/Controllers/Data/DestroyController.php
+++ b/app/Api/V1/Controllers/Data/DestroyController.php
@@ -54,7 +54,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private bool $unused;
diff --git a/app/Api/V1/Controllers/Data/Export/ExportController.php b/app/Api/V1/Controllers/Data/Export/ExportController.php
index 43e055e976..ff19c0f27f 100644
--- a/app/Api/V1/Controllers/Data/Export/ExportController.php
+++ b/app/Api/V1/Controllers/Data/Export/ExportController.php
@@ -38,7 +38,7 @@ use function Safe\date;
/**
* Class ExportController
*/
-class ExportController extends Controller
+final class ExportController extends Controller
{
private ExportDataGenerator $exporter;
protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
diff --git a/app/Api/V1/Controllers/Data/PurgeController.php b/app/Api/V1/Controllers/Data/PurgeController.php
index 2af2cd8bab..ad9a3e2495 100644
--- a/app/Api/V1/Controllers/Data/PurgeController.php
+++ b/app/Api/V1/Controllers/Data/PurgeController.php
@@ -44,7 +44,7 @@ use Illuminate\Http\Request;
/**
* Class PurgeController
*/
-class PurgeController extends Controller
+final class PurgeController extends Controller
{
protected array $acceptedRoles = [UserRoleEnum::FULL];
diff --git a/app/Api/V1/Controllers/Insight/Expense/AccountController.php b/app/Api/V1/Controllers/Insight/Expense/AccountController.php
index 5a5c2ff85a..eea69b2355 100644
--- a/app/Api/V1/Controllers/Insight/Expense/AccountController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/AccountController.php
@@ -37,7 +37,7 @@ use Illuminate\Http\JsonResponse;
* Shows expense information grouped or limited by date.
* I.e. all expenses grouped by account + currency.
*/
-class AccountController extends Controller
+final class AccountController extends Controller
{
use ApiSupport;
diff --git a/app/Api/V1/Controllers/Insight/Expense/BillController.php b/app/Api/V1/Controllers/Insight/Expense/BillController.php
index ca0ec0274e..8680b38dbc 100644
--- a/app/Api/V1/Controllers/Insight/Expense/BillController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/BillController.php
@@ -36,7 +36,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class BillController
*/
-class BillController extends Controller
+final class BillController extends Controller
{
private BillRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Insight/Expense/BudgetController.php b/app/Api/V1/Controllers/Insight/Expense/BudgetController.php
index 076cd64293..0d6c227707 100644
--- a/app/Api/V1/Controllers/Insight/Expense/BudgetController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/BudgetController.php
@@ -36,7 +36,7 @@ use Illuminate\Support\Collection;
/**
* Class BudgetController
*/
-class BudgetController extends Controller
+final class BudgetController extends Controller
{
private NoBudgetRepositoryInterface $noRepository;
private OperationsRepositoryInterface $opsRepository;
diff --git a/app/Api/V1/Controllers/Insight/Expense/CategoryController.php b/app/Api/V1/Controllers/Insight/Expense/CategoryController.php
index 00e996f553..a5e546ea0b 100644
--- a/app/Api/V1/Controllers/Insight/Expense/CategoryController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/CategoryController.php
@@ -36,7 +36,7 @@ use Illuminate\Support\Collection;
/**
* Class CategoryController
*/
-class CategoryController extends Controller
+final class CategoryController extends Controller
{
private NoCategoryRepositoryInterface $noRepository;
private OperationsRepositoryInterface $opsRepository;
diff --git a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php
index 24e408cd5c..5ab2c350fd 100644
--- a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php
@@ -35,7 +35,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class PeriodController
*/
-class PeriodController extends Controller
+final class PeriodController extends Controller
{
public function total(GenericRequest $request): JsonResponse
{
diff --git a/app/Api/V1/Controllers/Insight/Expense/TagController.php b/app/Api/V1/Controllers/Insight/Expense/TagController.php
index f42e3d04a9..ad399ccb65 100644
--- a/app/Api/V1/Controllers/Insight/Expense/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/TagController.php
@@ -36,7 +36,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class TagController
*/
-class TagController extends Controller
+final class TagController extends Controller
{
private TagRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Insight/Income/AccountController.php b/app/Api/V1/Controllers/Insight/Income/AccountController.php
index f151c62873..66fe0807b8 100644
--- a/app/Api/V1/Controllers/Insight/Income/AccountController.php
+++ b/app/Api/V1/Controllers/Insight/Income/AccountController.php
@@ -37,7 +37,7 @@ use Illuminate\Http\JsonResponse;
* Shows income information grouped or limited by date.
* I.e. all income grouped by account + currency.
*/
-class AccountController extends Controller
+final class AccountController extends Controller
{
use ApiSupport;
diff --git a/app/Api/V1/Controllers/Insight/Income/CategoryController.php b/app/Api/V1/Controllers/Insight/Income/CategoryController.php
index 6690239fd3..a81bf91be9 100644
--- a/app/Api/V1/Controllers/Insight/Income/CategoryController.php
+++ b/app/Api/V1/Controllers/Insight/Income/CategoryController.php
@@ -36,7 +36,7 @@ use Illuminate\Support\Collection;
/**
* Class CategoryController
*/
-class CategoryController extends Controller
+final class CategoryController extends Controller
{
private NoCategoryRepositoryInterface $noRepository;
private OperationsRepositoryInterface $opsRepository;
diff --git a/app/Api/V1/Controllers/Insight/Income/PeriodController.php b/app/Api/V1/Controllers/Insight/Income/PeriodController.php
index f413788066..b972335a4c 100644
--- a/app/Api/V1/Controllers/Insight/Income/PeriodController.php
+++ b/app/Api/V1/Controllers/Insight/Income/PeriodController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class PeriodController
*/
-class PeriodController extends Controller
+final class PeriodController extends Controller
{
public function total(GenericRequest $request): JsonResponse
{
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php
index e7439dca7a..94be2ae461 100644
--- a/app/Api/V1/Controllers/Insight/Income/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php
@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class TagController
*/
-class TagController extends Controller
+final class TagController extends Controller
{
private TagRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Insight/Transfer/AccountController.php b/app/Api/V1/Controllers/Insight/Transfer/AccountController.php
index 2a48129c14..399813ab9c 100644
--- a/app/Api/V1/Controllers/Insight/Transfer/AccountController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/AccountController.php
@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class AccountController
*/
-class AccountController extends Controller
+final class AccountController extends Controller
{
use ApiSupport;
diff --git a/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php b/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php
index 580f16be0d..2fc72229d3 100644
--- a/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php
@@ -36,7 +36,7 @@ use Illuminate\Support\Collection;
/**
* Class CategoryController
*/
-class CategoryController extends Controller
+final class CategoryController extends Controller
{
private NoCategoryRepositoryInterface $noRepository;
private OperationsRepositoryInterface $opsRepository;
diff --git a/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php b/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php
index 004aede122..cdae02e939 100644
--- a/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class PeriodController
*/
-class PeriodController extends Controller
+final class PeriodController extends Controller
{
public function total(GenericRequest $request): JsonResponse
{
diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
index 00fb4b6857..b7b85fd376 100644
--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class TagController
*/
-class TagController extends Controller
+final class TagController extends Controller
{
private TagRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Account/DestroyController.php b/app/Api/V1/Controllers/Models/Account/DestroyController.php
index c3359d66cf..976cb561de 100644
--- a/app/Api/V1/Controllers/Models/Account/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Account/DestroyController.php
@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
public const string RESOURCE_KEY = 'accounts';
diff --git a/app/Api/V1/Controllers/Models/Account/ListController.php b/app/Api/V1/Controllers/Models/Account/ListController.php
index da190328ce..42fa092486 100644
--- a/app/Api/V1/Controllers/Models/Account/ListController.php
+++ b/app/Api/V1/Controllers/Models/Account/ListController.php
@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\Account;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Generic\PaginationDateRangeRequest;
-use FireflyIII\Api\V1\Requests\Models\Transaction\ListRequest;
use FireflyIII\Api\V1\Requests\PaginationRequest;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Account;
@@ -47,7 +46,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
use TransactionFilter;
@@ -71,21 +70,21 @@ class ListController extends Controller
public function attachments(PaginationRequest $request, Account $account): JsonResponse
{
- $manager = $this->getManager();
- ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all();
- $collection = $this->repository->getAttachments($account);
+ $manager = $this->getManager();
+ ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all();
+ $collection = $this->repository->getAttachments($account);
- $count = $collection->count();
- $attachments = $collection->slice($offset, $limit);
+ $count = $collection->count();
+ $attachments = $collection->slice($offset, $limit);
// make paginator:
- $paginator = new LengthAwarePaginator($attachments, $count, $limit, $page);
- $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]).$this->buildParams());
+ $paginator = new LengthAwarePaginator($attachments, $count, $limit, $page);
+ $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]) . $this->buildParams());
/** @var AttachmentTransformer $transformer */
- $transformer = app(AttachmentTransformer::class);
+ $transformer = app(AttachmentTransformer::class);
- $resource = new FractalCollection($attachments, $transformer, 'attachments');
+ $resource = new FractalCollection($attachments, $transformer, 'attachments');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -94,31 +93,31 @@ class ListController extends Controller
public function piggyBanks(PaginationRequest $request, Account $account): JsonResponse
{
// create some objects:
- $manager = $this->getManager();
+ $manager = $this->getManager();
- ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all();
+ ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all();
// get list of piggy banks. Count it and split it.
- $collection = $this->repository->getPiggyBanks($account);
- $count = $collection->count();
- $piggyBanks = $collection->slice($offset, $limit);
+ $collection = $this->repository->getPiggyBanks($account);
+ $count = $collection->count();
+ $piggyBanks = $collection->slice($offset, $limit);
// enrich
/** @var User $admin */
- $admin = auth()->user();
- $enrichment = new PiggyBankEnrichment();
+ $admin = auth()->user();
+ $enrichment = new PiggyBankEnrichment();
$enrichment->setUser($admin);
- $piggyBanks = $enrichment->enrich($piggyBanks);
+ $piggyBanks = $enrichment->enrich($piggyBanks);
// make paginator:
- $paginator = new LengthAwarePaginator($piggyBanks, $count, $limit, $page);
- $paginator->setPath(route('api.v1.accounts.piggy-banks', [$account->id]).$this->buildParams());
+ $paginator = new LengthAwarePaginator($piggyBanks, $count, $limit, $page);
+ $paginator->setPath(route('api.v1.accounts.piggy-banks', [$account->id]) . $this->buildParams());
/** @var PiggyBankTransformer $transformer */
- $transformer = app(PiggyBankTransformer::class);
+ $transformer = app(PiggyBankTransformer::class);
// $transformer->setParameters($this->parameters);
- $resource = new FractalCollection($piggyBanks, $transformer, 'piggy-banks');
+ $resource = new FractalCollection($piggyBanks, $transformer, 'piggy-banks');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -129,16 +128,16 @@ class ListController extends Controller
*/
public function transactions(PaginationDateRangeRequest $request, Account $account): JsonResponse
{
- ['limit' => $limit, 'page' => $page, 'start' => $start, 'end' => $end, 'type' => $type] = $request->attributes->all();
- $types = $this->mapTransactionTypes($type ?? 'default');
- $manager = $this->getManager();
+ ['limit' => $limit, 'page' => $page, 'start' => $start, 'end' => $end, 'type' => $type] = $request->attributes->all();
+ $types = $this->mapTransactionTypes($type ?? 'default');
+ $manager = $this->getManager();
/** @var User $admin */
- $admin = auth()->user();
+ $admin = auth()->user();
// use new group collector:
/** @var GroupCollectorInterface $collector */
- $collector = app(GroupCollectorInterface::class);
+ $collector = app(GroupCollectorInterface::class);
$collector->setUser($admin)->setAccounts(new Collection()->push($account))->withAPIInformation()->setLimit($limit)->setPage($page)->setTypes($types);
if (null !== $start) {
$collector->setStart($start);
@@ -147,18 +146,18 @@ class ListController extends Controller
$collector->setEnd($end);
}
- $paginator = $collector->getPaginatedGroups();
- $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());
+ $paginator = $collector->getPaginatedGroups();
+ $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]) . $this->buildParams());
// enrich
- $enrichment = new TransactionGroupEnrichment();
+ $enrichment = new TransactionGroupEnrichment();
$enrichment->setUser($admin);
- $transactions = $enrichment->enrich($paginator->getCollection());
+ $transactions = $enrichment->enrich($paginator->getCollection());
/** @var TransactionGroupTransformer $transformer */
- $transformer = app(TransactionGroupTransformer::class);
+ $transformer = app(TransactionGroupTransformer::class);
- $resource = new FractalCollection($transactions, $transformer, 'transactions');
+ $resource = new FractalCollection($transactions, $transformer, 'transactions');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
diff --git a/app/Api/V1/Controllers/Models/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.php
index 2a9c0f0ec2..4a27acc062 100644
--- a/app/Api/V1/Controllers/Models/Account/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php
@@ -41,7 +41,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
use AccountFilter;
diff --git a/app/Api/V1/Controllers/Models/Account/StoreController.php b/app/Api/V1/Controllers/Models/Account/StoreController.php
index 4369470d4d..2e97ee1f24 100644
--- a/app/Api/V1/Controllers/Models/Account/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Account/StoreController.php
@@ -36,7 +36,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
public const string RESOURCE_KEY = 'accounts';
diff --git a/app/Api/V1/Controllers/Models/Account/UpdateController.php b/app/Api/V1/Controllers/Models/Account/UpdateController.php
index 60eb57fbb6..0c683b7fe9 100644
--- a/app/Api/V1/Controllers/Models/Account/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Account/UpdateController.php
@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
public const string RESOURCE_KEY = 'accounts';
diff --git a/app/Api/V1/Controllers/Models/Attachment/DestroyController.php b/app/Api/V1/Controllers/Models/Attachment/DestroyController.php
index 23df884307..7820ad4eea 100644
--- a/app/Api/V1/Controllers/Models/Attachment/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Attachment/DestroyController.php
@@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private AttachmentRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Attachment/ShowController.php b/app/Api/V1/Controllers/Models/Attachment/ShowController.php
index 41b1da901b..be0fbe5710 100644
--- a/app/Api/V1/Controllers/Models/Attachment/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Attachment/ShowController.php
@@ -44,7 +44,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private AttachmentRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Attachment/StoreController.php b/app/Api/V1/Controllers/Models/Attachment/StoreController.php
index c7ce834fe8..cf2af07158 100644
--- a/app/Api/V1/Controllers/Models/Attachment/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Attachment/StoreController.php
@@ -42,7 +42,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
private AttachmentRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Attachment/UpdateController.php b/app/Api/V1/Controllers/Models/Attachment/UpdateController.php
index a69ad515d0..bff86bd0ec 100644
--- a/app/Api/V1/Controllers/Models/Attachment/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Attachment/UpdateController.php
@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private AttachmentRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php
index 71e77638d7..943269b5eb 100644
--- a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php
+++ b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php
@@ -40,7 +40,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private AvailableBudgetRepositoryInterface $abRepository;
diff --git a/app/Api/V1/Controllers/Models/Bill/DestroyController.php b/app/Api/V1/Controllers/Models/Bill/DestroyController.php
index 68f2f2322e..066cb2f899 100644
--- a/app/Api/V1/Controllers/Models/Bill/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Bill/DestroyController.php
@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private BillRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Bill/ListController.php b/app/Api/V1/Controllers/Models/Bill/ListController.php
index 02e6c9571d..617bacca10 100644
--- a/app/Api/V1/Controllers/Models/Bill/ListController.php
+++ b/app/Api/V1/Controllers/Models/Bill/ListController.php
@@ -44,7 +44,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/Bill/ShowController.php b/app/Api/V1/Controllers/Models/Bill/ShowController.php
index d2e4238ab2..1fdb06ea9c 100644
--- a/app/Api/V1/Controllers/Models/Bill/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php
@@ -41,7 +41,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private BillRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Bill/StoreController.php b/app/Api/V1/Controllers/Models/Bill/StoreController.php
index f6787572b3..ac1e05ff24 100644
--- a/app/Api/V1/Controllers/Models/Bill/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Bill/StoreController.php
@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/Bill/UpdateController.php b/app/Api/V1/Controllers/Models/Bill/UpdateController.php
index 9824103e5a..fd18909383 100644
--- a/app/Api/V1/Controllers/Models/Bill/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Bill/UpdateController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private BillRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Budget/DestroyController.php b/app/Api/V1/Controllers/Models/Budget/DestroyController.php
index 797f51a64b..288b52cf12 100644
--- a/app/Api/V1/Controllers/Models/Budget/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Budget/DestroyController.php
@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private BudgetRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Budget/ListController.php b/app/Api/V1/Controllers/Models/Budget/ListController.php
index 92d9d1fc7b..9505ff4ea2 100644
--- a/app/Api/V1/Controllers/Models/Budget/ListController.php
+++ b/app/Api/V1/Controllers/Models/Budget/ListController.php
@@ -44,7 +44,7 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
// Class ListController
-class ListController extends Controller
+final class ListController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/Budget/ShowController.php b/app/Api/V1/Controllers/Models/Budget/ShowController.php
index e0acca2b76..17d4bc5c3e 100644
--- a/app/Api/V1/Controllers/Models/Budget/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Budget/ShowController.php
@@ -40,7 +40,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private BudgetLimitRepositoryInterface $blRepository;
private BudgetRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Budget/StoreController.php b/app/Api/V1/Controllers/Models/Budget/StoreController.php
index db9416f1cb..e6a5a8960b 100644
--- a/app/Api/V1/Controllers/Models/Budget/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Budget/StoreController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
private BudgetRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Budget/UpdateController.php b/app/Api/V1/Controllers/Models/Budget/UpdateController.php
index bfb9d8478e..004ba2a9d9 100644
--- a/app/Api/V1/Controllers/Models/Budget/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Budget/UpdateController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private BudgetRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php b/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php
index fb648c564d..a47a572167 100644
--- a/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php
@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private BudgetLimitRepositoryInterface $blRepository;
diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php
index f21f276843..f5ebeb7ee0 100644
--- a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php
@@ -40,7 +40,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php
index 9b84a1e6fe..eb2ccbdf9c 100644
--- a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php
@@ -44,7 +44,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private BudgetLimitRepositoryInterface $blRepository;
private BudgetRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
index 7ce95da4ad..17022a1285 100644
--- a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
private BudgetLimitRepositoryInterface $blRepository;
diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php
index 2e71ab25bb..2106b0ca09 100644
--- a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php
@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private BudgetLimitRepositoryInterface $blRepository;
diff --git a/app/Api/V1/Controllers/Models/Category/DestroyController.php b/app/Api/V1/Controllers/Models/Category/DestroyController.php
index 32c6444315..3b377d1d5f 100644
--- a/app/Api/V1/Controllers/Models/Category/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Category/DestroyController.php
@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private CategoryRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Category/ListController.php b/app/Api/V1/Controllers/Models/Category/ListController.php
index 46ce84caed..384e5ea013 100644
--- a/app/Api/V1/Controllers/Models/Category/ListController.php
+++ b/app/Api/V1/Controllers/Models/Category/ListController.php
@@ -42,7 +42,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/Category/ShowController.php b/app/Api/V1/Controllers/Models/Category/ShowController.php
index b8b8df00bb..87f24f23a7 100644
--- a/app/Api/V1/Controllers/Models/Category/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Category/ShowController.php
@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private CategoryRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Category/StoreController.php b/app/Api/V1/Controllers/Models/Category/StoreController.php
index 99ed2d0e61..b9639902a3 100644
--- a/app/Api/V1/Controllers/Models/Category/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Category/StoreController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
private CategoryRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Category/UpdateController.php b/app/Api/V1/Controllers/Models/Category/UpdateController.php
index c9a7c8910b..3f482b35ad 100644
--- a/app/Api/V1/Controllers/Models/Category/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Category/UpdateController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private CategoryRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php
index e6f185b633..4d9623627d 100644
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php
@@ -36,7 +36,7 @@ use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
use ValidatesUserGroupTrait;
diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php
index 4f55c411e9..b60b8fae77 100644
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php
@@ -36,7 +36,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
/**
* Class ShowController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
use ValidatesUserGroupTrait;
diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php
index 157ad52eec..c8e03c2360 100644
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php
@@ -40,7 +40,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
use ValidatesUserGroupTrait;
diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php
index c601e62384..9d8308def6 100644
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php
@@ -41,7 +41,7 @@ use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
-class StoreController extends Controller
+final class StoreController extends Controller
{
use ValidatesUserGroupTrait;
diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php
index f70a21a797..939160ebc0 100644
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php
@@ -37,7 +37,7 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
use ValidatesUserGroupTrait;
diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php b/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php
index eb0b25aa38..9bc916cb19 100644
--- a/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php
@@ -34,7 +34,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private ObjectGroupRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php
index 7a18b363d6..6a4e7ebc33 100644
--- a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php
+++ b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php
@@ -40,7 +40,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
private ObjectGroupRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php
index 7381460148..589a60f4b6 100644
--- a/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php
+++ b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php
@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private ObjectGroupRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php b/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php
index dc6a06087d..c39763e600 100644
--- a/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php
@@ -36,7 +36,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private ObjectGroupRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php b/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php
index 26cb9da47f..c228c4290d 100644
--- a/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php
@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private PiggyBankRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php
index fdc0e7d9f9..60117da1a0 100644
--- a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php
@@ -41,7 +41,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
private PiggyBankRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php
index e80c617371..f305d7cd25 100644
--- a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php
@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private PiggyBankRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php b/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php
index 80858e3875..d502921765 100644
--- a/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
private PiggyBankRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php
index 9cc3edef43..65f742b31a 100644
--- a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private PiggyBankRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php b/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php
index 6bc9d9d635..72989a5313 100644
--- a/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php
@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private RecurringRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Recurrence/ListController.php b/app/Api/V1/Controllers/Models/Recurrence/ListController.php
index a67b959017..79b23bf6a4 100644
--- a/app/Api/V1/Controllers/Models/Recurrence/ListController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/ListController.php
@@ -40,7 +40,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php
index c0dd269c0e..8c9cdef82a 100644
--- a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php
@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private RecurringRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Recurrence/StoreController.php b/app/Api/V1/Controllers/Models/Recurrence/StoreController.php
index 3d0a4a36c8..2c3a574f4f 100644
--- a/app/Api/V1/Controllers/Models/Recurrence/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/StoreController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
private RecurringRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Recurrence/TriggerController.php b/app/Api/V1/Controllers/Models/Recurrence/TriggerController.php
index 94028f001f..898b43525b 100644
--- a/app/Api/V1/Controllers/Models/Recurrence/TriggerController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/TriggerController.php
@@ -41,7 +41,7 @@ use Illuminate\Support\Facades\Log;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
-class TriggerController extends Controller
+final class TriggerController extends Controller
{
private RecurringRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php
index 3805ac90b8..203230b19a 100644
--- a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private RecurringRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Rule/DestroyController.php b/app/Api/V1/Controllers/Models/Rule/DestroyController.php
index 887f53cdfd..a9fff279f9 100644
--- a/app/Api/V1/Controllers/Models/Rule/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Rule/DestroyController.php
@@ -34,7 +34,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private RuleRepositoryInterface $ruleRepository;
diff --git a/app/Api/V1/Controllers/Models/Rule/ExpressionController.php b/app/Api/V1/Controllers/Models/Rule/ExpressionController.php
index 6f24527c6e..297cc1bbc2 100644
--- a/app/Api/V1/Controllers/Models/Rule/ExpressionController.php
+++ b/app/Api/V1/Controllers/Models/Rule/ExpressionController.php
@@ -31,7 +31,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class ExpressionController
*/
-class ExpressionController extends Controller
+final class ExpressionController extends Controller
{
/**
* This endpoint is documented at:
diff --git a/app/Api/V1/Controllers/Models/Rule/ShowController.php b/app/Api/V1/Controllers/Models/Rule/ShowController.php
index 0955f8b66a..fc8d40737a 100644
--- a/app/Api/V1/Controllers/Models/Rule/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Rule/ShowController.php
@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private RuleRepositoryInterface $ruleRepository;
diff --git a/app/Api/V1/Controllers/Models/Rule/StoreController.php b/app/Api/V1/Controllers/Models/Rule/StoreController.php
index dd7b6e2dd1..10ea227aa4 100644
--- a/app/Api/V1/Controllers/Models/Rule/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Rule/StoreController.php
@@ -35,7 +35,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
private RuleRepositoryInterface $ruleRepository;
diff --git a/app/Api/V1/Controllers/Models/Rule/TriggerController.php b/app/Api/V1/Controllers/Models/Rule/TriggerController.php
index 644a9ff0f7..e8a55ca5e4 100644
--- a/app/Api/V1/Controllers/Models/Rule/TriggerController.php
+++ b/app/Api/V1/Controllers/Models/Rule/TriggerController.php
@@ -42,7 +42,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class TriggerController
*/
-class TriggerController extends Controller
+final class TriggerController extends Controller
{
private RuleRepositoryInterface $ruleRepository;
diff --git a/app/Api/V1/Controllers/Models/Rule/UpdateController.php b/app/Api/V1/Controllers/Models/Rule/UpdateController.php
index 87861956fb..1867208f41 100644
--- a/app/Api/V1/Controllers/Models/Rule/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Rule/UpdateController.php
@@ -36,7 +36,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private RuleRepositoryInterface $ruleRepository;
diff --git a/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php b/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php
index a3de71cedd..15a4585317 100644
--- a/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php
@@ -34,7 +34,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private RuleGroupRepositoryInterface $ruleGroupRepository;
diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php
index 3b9d42cefd..96ae8521cb 100644
--- a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php
+++ b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
private RuleGroupRepositoryInterface $ruleGroupRepository;
diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php b/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php
index 3589218f1f..cd842f7636 100644
--- a/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php
+++ b/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php
@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private RuleGroupRepositoryInterface $ruleGroupRepository;
diff --git a/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php b/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php
index e0521d95b9..2fdd88323e 100644
--- a/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php
+++ b/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php
@@ -36,7 +36,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
private AccountRepositoryInterface $accountRepository;
private RuleGroupRepositoryInterface $ruleGroupRepository;
diff --git a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php
index 18652acff2..9429ed4908 100644
--- a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php
+++ b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php
@@ -43,7 +43,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class TriggerController
*/
-class TriggerController extends Controller
+final class TriggerController extends Controller
{
private RuleGroupRepositoryInterface $ruleGroupRepository;
diff --git a/app/Api/V1/Controllers/Models/Tag/DestroyController.php b/app/Api/V1/Controllers/Models/Tag/DestroyController.php
index 7ef770ad12..b1b09a77d0 100644
--- a/app/Api/V1/Controllers/Models/Tag/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Tag/DestroyController.php
@@ -34,7 +34,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private TagRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Tag/ListController.php b/app/Api/V1/Controllers/Models/Tag/ListController.php
index 8a73e6679e..d729601f06 100644
--- a/app/Api/V1/Controllers/Models/Tag/ListController.php
+++ b/app/Api/V1/Controllers/Models/Tag/ListController.php
@@ -42,7 +42,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/Tag/ShowController.php b/app/Api/V1/Controllers/Models/Tag/ShowController.php
index 04b6e04d5f..be923830f6 100644
--- a/app/Api/V1/Controllers/Models/Tag/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Tag/ShowController.php
@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private TagRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Tag/StoreController.php b/app/Api/V1/Controllers/Models/Tag/StoreController.php
index 62dfcaef1d..2be32d3362 100644
--- a/app/Api/V1/Controllers/Models/Tag/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Tag/StoreController.php
@@ -35,7 +35,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
private TagRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Tag/UpdateController.php b/app/Api/V1/Controllers/Models/Tag/UpdateController.php
index 09b67903e9..2bb2a16338 100644
--- a/app/Api/V1/Controllers/Models/Tag/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Tag/UpdateController.php
@@ -36,7 +36,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private TagRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php
index 6557b0397a..76eac21f5d 100644
--- a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php
@@ -37,7 +37,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private TransactionGroupRepository $groupRepository;
private JournalRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/Transaction/ListController.php b/app/Api/V1/Controllers/Models/Transaction/ListController.php
index 51df963149..284ffc4c23 100644
--- a/app/Api/V1/Controllers/Models/Transaction/ListController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/ListController.php
@@ -42,7 +42,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
private JournalAPIRepositoryInterface $journalAPIRepository;
diff --git a/app/Api/V1/Controllers/Models/Transaction/ShowController.php b/app/Api/V1/Controllers/Models/Transaction/ShowController.php
index e59e796404..dd7c84ee64 100644
--- a/app/Api/V1/Controllers/Models/Transaction/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/ShowController.php
@@ -42,7 +42,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/Transaction/StoreController.php b/app/Api/V1/Controllers/Models/Transaction/StoreController.php
index a93ae6f5ba..c23daa1126 100644
--- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php
@@ -48,7 +48,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php
index cee5b26ce8..b646b20c0c 100644
--- a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php
@@ -45,7 +45,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private TransactionGroupRepositoryInterface $groupRepository;
diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
index d81d0a20a6..73e0bd6c96 100644
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
@@ -38,7 +38,7 @@ use Illuminate\Validation\ValidationException;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private CurrencyRepositoryInterface $repository;
private UserRepositoryInterface $userRepository;
diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
index 52117fdd2f..6b9a9505a7 100644
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
@@ -61,7 +61,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
use AccountFilter;
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php
index 18fb36b928..a643398767 100644
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php
@@ -40,7 +40,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
use AccountFilter;
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php
index 4dc5004dd5..a970467c6f 100644
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php
@@ -38,7 +38,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
use AccountFilter;
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php
index 113ee5b0ab..bc6e4f6ba2 100644
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php
@@ -41,7 +41,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
use AccountFilter;
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php
index 41b07687ce..8b4417b983 100644
--- a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php
@@ -34,7 +34,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private LinkTypeRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php
index 5ec069ffa4..792e073b64 100644
--- a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php
@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private LinkTypeRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php
index e6893498a6..5da90bbd04 100644
--- a/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php
@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php
index d22bcadea5..351c79c8c8 100644
--- a/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php
@@ -37,7 +37,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private JournalRepositoryInterface $journalRepository;
private LinkTypeRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php
index 5093b5ffd4..0cccf659d6 100644
--- a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php
@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php
index 6c3d5fdc0a..0df12a38c2 100644
--- a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php
@@ -40,7 +40,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class ListController
*/
-class ListController extends Controller
+final class ListController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php
index 30baed01c1..e3ac05e86c 100644
--- a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php
@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php
index 0bf672ca49..a5c1d5a028 100644
--- a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php
@@ -39,7 +39,7 @@ use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php
index 12b5113c30..b9f65f661d 100644
--- a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php
@@ -41,7 +41,7 @@ use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
use TransactionFilter;
diff --git a/app/Api/V1/Controllers/Models/UserGroup/IndexController.php b/app/Api/V1/Controllers/Models/UserGroup/IndexController.php
index 1f60571ffe..99acc7464b 100644
--- a/app/Api/V1/Controllers/Models/UserGroup/IndexController.php
+++ b/app/Api/V1/Controllers/Models/UserGroup/IndexController.php
@@ -31,7 +31,7 @@ use FireflyIII\Transformers\UserGroupTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator;
-class IndexController extends Controller
+final class IndexController extends Controller
{
public const string RESOURCE_KEY = 'user_groups';
diff --git a/app/Api/V1/Controllers/Models/UserGroup/ShowController.php b/app/Api/V1/Controllers/Models/UserGroup/ShowController.php
index 7945f2ecc1..1d0d3f21a0 100644
--- a/app/Api/V1/Controllers/Models/UserGroup/ShowController.php
+++ b/app/Api/V1/Controllers/Models/UserGroup/ShowController.php
@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
public const string RESOURCE_KEY = 'user_groups';
diff --git a/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php b/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php
index 20dd7f70c2..95479cda5a 100644
--- a/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php
@@ -33,7 +33,7 @@ use FireflyIII\Transformers\UserGroupTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log;
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
public const string RESOURCE_KEY = 'user_groups';
diff --git a/app/Api/V1/Controllers/Search/AccountController.php b/app/Api/V1/Controllers/Search/AccountController.php
index caaa0c879b..606e020ac4 100644
--- a/app/Api/V1/Controllers/Search/AccountController.php
+++ b/app/Api/V1/Controllers/Search/AccountController.php
@@ -41,7 +41,7 @@ use League\Fractal\Resource\Collection as FractalCollection;
/**
* Class AccountController
*/
-class AccountController extends Controller
+final class AccountController extends Controller
{
use AccountFilter;
diff --git a/app/Api/V1/Controllers/Search/TransactionController.php b/app/Api/V1/Controllers/Search/TransactionController.php
index 09a25674d7..3ff791d5cf 100644
--- a/app/Api/V1/Controllers/Search/TransactionController.php
+++ b/app/Api/V1/Controllers/Search/TransactionController.php
@@ -40,7 +40,7 @@ use League\Fractal\Resource\Collection;
/**
* Class TransactionController
*/
-class TransactionController extends Controller
+final class TransactionController extends Controller
{
private JournalRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.php
index 900ff8c8a2..872e3b90fc 100644
--- a/app/Api/V1/Controllers/Summary/BasicController.php
+++ b/app/Api/V1/Controllers/Summary/BasicController.php
@@ -50,7 +50,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class BasicController
*/
-class BasicController extends Controller
+final class BasicController extends Controller
{
private AvailableBudgetRepositoryInterface $abRepository;
private AccountRepositoryInterface $accountRepository;
diff --git a/app/Api/V1/Controllers/System/AboutController.php b/app/Api/V1/Controllers/System/AboutController.php
index 2c6d53f038..7157d9266d 100644
--- a/app/Api/V1/Controllers/System/AboutController.php
+++ b/app/Api/V1/Controllers/System/AboutController.php
@@ -35,7 +35,7 @@ use League\Fractal\Resource\Item;
*
* Class AboutController.
*/
-class AboutController extends Controller
+final class AboutController extends Controller
{
/**
* This endpoint is documented at:
diff --git a/app/Api/V1/Controllers/System/BatchController.php b/app/Api/V1/Controllers/System/BatchController.php
index aee4fdfe44..fad68f854f 100644
--- a/app/Api/V1/Controllers/System/BatchController.php
+++ b/app/Api/V1/Controllers/System/BatchController.php
@@ -33,7 +33,7 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
-class BatchController extends Controller
+final class BatchController extends Controller
{
private JournalRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/System/ConfigurationController.php b/app/Api/V1/Controllers/System/ConfigurationController.php
index 37f3426f53..a46699330f 100644
--- a/app/Api/V1/Controllers/System/ConfigurationController.php
+++ b/app/Api/V1/Controllers/System/ConfigurationController.php
@@ -41,7 +41,7 @@ use Illuminate\Validation\ValidationException;
/**
* Class ConfigurationController
*/
-class ConfigurationController extends Controller
+final class ConfigurationController extends Controller
{
private UserRepositoryInterface $repository;
@@ -193,7 +193,7 @@ class ConfigurationController extends Controller
'enable_external_rates' => $enableExternalRates?->data,
'allow_webhooks' => $allowWebhooks?->data,
'enable_batch_processing' => $enableBatchProcessing?->data,
- 'valid_url_protocols' => $validUrlProtocols?->data ?? 'http,https',
+ 'valid_url_protocols' => $validUrlProtocols->data ?? 'http,https',
];
}
diff --git a/app/Api/V1/Controllers/System/CronController.php b/app/Api/V1/Controllers/System/CronController.php
index 05a089b9e9..fcbad108ae 100644
--- a/app/Api/V1/Controllers/System/CronController.php
+++ b/app/Api/V1/Controllers/System/CronController.php
@@ -34,7 +34,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class CronController
*/
-class CronController extends Controller
+final class CronController extends Controller
{
use CronRunner;
diff --git a/app/Api/V1/Controllers/System/UserController.php b/app/Api/V1/Controllers/System/UserController.php
index 5f066ca141..845215cab3 100644
--- a/app/Api/V1/Controllers/System/UserController.php
+++ b/app/Api/V1/Controllers/System/UserController.php
@@ -41,7 +41,7 @@ use League\Fractal\Resource\Item;
/**
* Class UserController.
*/
-class UserController extends Controller
+final class UserController extends Controller
{
private UserRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/User/PreferencesController.php b/app/Api/V1/Controllers/User/PreferencesController.php
index 9c0be7163e..9171c0751a 100644
--- a/app/Api/V1/Controllers/User/PreferencesController.php
+++ b/app/Api/V1/Controllers/User/PreferencesController.php
@@ -40,7 +40,7 @@ use League\Fractal\Resource\Item;
/**
* Class PreferencesController
*/
-class PreferencesController extends Controller
+final class PreferencesController extends Controller
{
public const string DATE_FORMAT = 'Y-m-d';
public const string RESOURCE_KEY = 'preferences';
diff --git a/app/Api/V1/Controllers/Webhook/AttemptController.php b/app/Api/V1/Controllers/Webhook/AttemptController.php
index 469c0508a3..89e0b21e7a 100644
--- a/app/Api/V1/Controllers/Webhook/AttemptController.php
+++ b/app/Api/V1/Controllers/Webhook/AttemptController.php
@@ -43,7 +43,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class AttemptController
*/
-class AttemptController extends Controller
+final class AttemptController extends Controller
{
public const string RESOURCE_KEY = 'webhook_attempts';
diff --git a/app/Api/V1/Controllers/Webhook/DestroyController.php b/app/Api/V1/Controllers/Webhook/DestroyController.php
index 5a0d3eb1b5..8da81638f5 100644
--- a/app/Api/V1/Controllers/Webhook/DestroyController.php
+++ b/app/Api/V1/Controllers/Webhook/DestroyController.php
@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class DestroyController
*/
-class DestroyController extends Controller
+final class DestroyController extends Controller
{
private WebhookRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Webhook/MessageController.php b/app/Api/V1/Controllers/Webhook/MessageController.php
index 54bfe830c4..e6915d865f 100644
--- a/app/Api/V1/Controllers/Webhook/MessageController.php
+++ b/app/Api/V1/Controllers/Webhook/MessageController.php
@@ -42,7 +42,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class MessageController
*/
-class MessageController extends Controller
+final class MessageController extends Controller
{
public const string RESOURCE_KEY = 'webhook_messages';
diff --git a/app/Api/V1/Controllers/Webhook/ShowController.php b/app/Api/V1/Controllers/Webhook/ShowController.php
index 61cd6ddd37..91a2e161eb 100644
--- a/app/Api/V1/Controllers/Webhook/ShowController.php
+++ b/app/Api/V1/Controllers/Webhook/ShowController.php
@@ -47,7 +47,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
public const string RESOURCE_KEY = 'webhooks';
diff --git a/app/Api/V1/Controllers/Webhook/StoreController.php b/app/Api/V1/Controllers/Webhook/StoreController.php
index 9d0afdd7ca..d20b8df057 100644
--- a/app/Api/V1/Controllers/Webhook/StoreController.php
+++ b/app/Api/V1/Controllers/Webhook/StoreController.php
@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class StoreController
*/
-class StoreController extends Controller
+final class StoreController extends Controller
{
public const string RESOURCE_KEY = 'webhooks';
diff --git a/app/Api/V1/Controllers/Webhook/SubmitController.php b/app/Api/V1/Controllers/Webhook/SubmitController.php
index 6edd2304c2..e5117ac2a8 100644
--- a/app/Api/V1/Controllers/Webhook/SubmitController.php
+++ b/app/Api/V1/Controllers/Webhook/SubmitController.php
@@ -36,7 +36,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class SubmitController
*/
-class SubmitController extends Controller
+final class SubmitController extends Controller
{
private WebhookRepositoryInterface $repository;
diff --git a/app/Api/V1/Controllers/Webhook/UpdateController.php b/app/Api/V1/Controllers/Webhook/UpdateController.php
index 30ae203b30..ce69fa7742 100644
--- a/app/Api/V1/Controllers/Webhook/UpdateController.php
+++ b/app/Api/V1/Controllers/Webhook/UpdateController.php
@@ -40,7 +40,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class UpdateController
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
private WebhookRepositoryInterface $repository;
diff --git a/app/Api/V1/Requests/AggregateFormRequest.php b/app/Api/V1/Requests/AggregateFormRequest.php
index f4e9671b1b..3d80afa2bf 100644
--- a/app/Api/V1/Requests/AggregateFormRequest.php
+++ b/app/Api/V1/Requests/AggregateFormRequest.php
@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Requests;
use Illuminate\Contracts\Validation\Validator;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
use Override;
use RuntimeException;
@@ -45,8 +44,9 @@ abstract class AggregateFormRequest extends ApiRequest
array $cookies = [],
array $files = [],
array $server = [],
- $content = null
- ): void {
+ $content = null
+ ): void
+ {
parent::initialize($query, $request, $attributes, $cookies, $files, $server, $content);
// instantiate all subrequests and share current requests' bags with them
@@ -54,14 +54,15 @@ abstract class AggregateFormRequest extends ApiRequest
/** @var array|string $config */
foreach ($this->getRequests() as $config) {
- $requestClass = is_array($config) ? array_shift($config) : $config;
+ $requestClass = is_array($config) ? array_shift($config) : $config;
if (!is_a($requestClass, Request::class, true)) {
throw new RuntimeException('getRequests() must return class-strings of subclasses of Request');
}
// Log::debug(sprintf('Initializing subrequest %s', $requestClass));
- $instance = $this->requests[] = new $requestClass();
+ $instance = new $requestClass();
+ $this->requests[] = $instance;
$instance->request = $this->request;
$instance->query = $this->query;
$instance->attributes = $this->attributes;
@@ -83,7 +84,7 @@ abstract class AggregateFormRequest extends ApiRequest
// check all subrequests for rules and combine them
return array_reduce(
$this->requests,
- static fn (array $rules, FormRequest $request): array => $rules + (method_exists($request, 'rules') ? $request->rules() : []),
+ static fn(array $rules, FormRequest $request): array => $rules + (method_exists($request, 'rules') ? $request->rules() : []),
[]
);
}
diff --git a/app/Api/V1/Requests/Generic/PaginationDateRangeRequest.php b/app/Api/V1/Requests/Generic/PaginationDateRangeRequest.php
index 0ac9d037ef..55327f97f3 100644
--- a/app/Api/V1/Requests/Generic/PaginationDateRangeRequest.php
+++ b/app/Api/V1/Requests/Generic/PaginationDateRangeRequest.php
@@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Requests\AggregateFormRequest;
use FireflyIII\Api\V1\Requests\DateRangeRequest;
use FireflyIII\Api\V1\Requests\PaginationRequest;
use FireflyIII\Models\Transaction;
+use Override;
/**
* TODO this class includes an object type filter which should be moved to its own thing.
diff --git a/app/Api/V1/Requests/Models/Account/StoreRequest.php b/app/Api/V1/Requests/Models/Account/StoreRequest.php
index 3d04bb7cee..43f854e212 100644
--- a/app/Api/V1/Requests/Models/Account/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Account/StoreRequest.php
@@ -98,7 +98,7 @@ class StoreRequest extends FormRequest
$type = $this->convertString('type');
$rules = [
'name' => 'required|max:1024|min:1|uniqueAccountForUser',
- 'type' => 'required|max:1024|min:1|'.sprintf('in:%s', $types),
+ 'type' => sprintf('required|max:1024|min:1|in:%s', $types),
'iban' => ['iban', 'nullable', new UniqueIban(null, $type)],
'bic' => 'bic|nullable',
'account_number' => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber(null, $type)],
diff --git a/app/Console/Commands/Upgrade/UpgradesToGroups.php b/app/Console/Commands/Upgrade/UpgradesToGroups.php
index 0981af55b4..a9d39c6020 100644
--- a/app/Console/Commands/Upgrade/UpgradesToGroups.php
+++ b/app/Console/Commands/Upgrade/UpgradesToGroups.php
@@ -86,7 +86,7 @@ class UpgradesToGroups extends Command
private function findOpposingTransaction(TransactionJournal $journal, Transaction $transaction): ?Transaction
{
$set = $journal->transactions->filter(static function (Transaction $subject) use ($transaction): bool {
- $amount = ((float) $transaction->amount * -1) === (float) $subject->amount; // intentional float
+ $amount = (((float) $transaction->amount) * -1) === (float) $subject->amount; // intentional float
$identifier = $transaction->identifier === $subject->identifier;
Log::debug(sprintf('Amount the same? %s', var_export($amount, true)));
Log::debug(sprintf('ID the same? %s', var_export($identifier, true)));
diff --git a/app/Helpers/Collector/Extensions/AttachmentCollection.php b/app/Helpers/Collector/Extensions/AttachmentCollection.php
index c518199364..e8e94d0749 100644
--- a/app/Helpers/Collector/Extensions/AttachmentCollection.php
+++ b/app/Helpers/Collector/Extensions/AttachmentCollection.php
@@ -273,8 +273,9 @@ trait AttachmentCollection
/** @var null|Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object?->notes()->first()?->text;
-
- return '' !== $notes && $notes === $value;
+ if('' !== $notes && $notes === $value) {
+ return true;
+ }
}
}
@@ -297,8 +298,9 @@ trait AttachmentCollection
/** @var null|Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object?->notes()->first()?->text;
-
- return '' !== $notes && $notes !== $value;
+ if('' !== $notes && $notes !== $value) {
+ return true;
+ }
}
}
@@ -321,8 +323,9 @@ trait AttachmentCollection
/** @var null|Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object?->notes()->first()?->text;
-
- return '' !== $notes && str_contains(strtolower($notes), strtolower($value));
+ if( '' !== $notes && str_contains(strtolower($notes), strtolower($value))) {
+ return true;
+ }
}
}
@@ -345,8 +348,9 @@ trait AttachmentCollection
/** @var null|Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object?->notes()->first()?->text;
-
- return '' !== $notes && !str_contains(strtolower($notes), strtolower($value));
+ if('' !== $notes && !str_contains(strtolower($notes), strtolower($value))) {
+ return true;
+ }
}
}
@@ -370,7 +374,9 @@ trait AttachmentCollection
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object?->notes()->first()?->text;
- return '' !== $notes && !str_ends_with(strtolower($notes), strtolower($value));
+ if('' !== $notes && !str_ends_with(strtolower($notes), strtolower($value))) {
+ return true;
+ }
}
}
@@ -393,8 +399,9 @@ trait AttachmentCollection
/** @var null|Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object?->notes()->first()?->text;
-
- return '' !== $notes && !str_starts_with(strtolower($notes), strtolower($value));
+ if('' !== $notes && !str_starts_with(strtolower($notes), strtolower($value))) {
+ return true;
+ }
}
}
@@ -417,8 +424,9 @@ trait AttachmentCollection
/** @var null|Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object?->notes()->first()?->text;
-
- return '' !== $notes && str_ends_with(strtolower($notes), strtolower($value));
+ if('' !== $notes && str_ends_with(strtolower($notes), strtolower($value))) {
+ return true;
+ }
}
}
@@ -441,8 +449,9 @@ trait AttachmentCollection
/** @var null|Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object?->notes()->first()?->text;
-
- return '' !== $notes && str_starts_with(strtolower($notes), strtolower($value));
+ if('' !== $notes && str_starts_with(strtolower($notes), strtolower($value))) {
+ return true;
+ }
}
}
diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php
index 31561b6433..b80c3826d9 100644
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -283,9 +283,10 @@ class GroupCollector implements GroupCollectorInterface
}
echo $query;
- echo '';
- print_r($this->query->getBindings());
- echo '
';
+ die(PHP_EOL. 'To see the query, uncomment the next lines first.');
+// echo '';
+// print_r($this->query->getBindings());
+// echo '
';
}
public function dumpQueryInLogs(): void
diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php
index 6b47c8ec9f..12b5911e92 100644
--- a/app/Http/Controllers/Account/CreateController.php
+++ b/app/Http/Controllers/Account/CreateController.php
@@ -43,7 +43,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
use ModelInformation;
diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php
index 721475b0f3..da31d136b8 100644
--- a/app/Http/Controllers/Account/DeleteController.php
+++ b/app/Http/Controllers/Account/DeleteController.php
@@ -37,7 +37,7 @@ use Illuminate\View\View;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
/** @var AccountRepositoryInterface The account repository */
private $repository;
diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php
index aac979cbab..035d24c2e6 100644
--- a/app/Http/Controllers/Account/EditController.php
+++ b/app/Http/Controllers/Account/EditController.php
@@ -43,7 +43,7 @@ use Illuminate\View\View;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
use ModelInformation;
diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php
index 682c24f91c..ef8dddb140 100644
--- a/app/Http/Controllers/Account/IndexController.php
+++ b/app/Http/Controllers/Account/IndexController.php
@@ -41,7 +41,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
use BasicDataSupport;
diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php
index 2d13fe0d56..d97836c5a8 100644
--- a/app/Http/Controllers/Account/ReconcileController.php
+++ b/app/Http/Controllers/Account/ReconcileController.php
@@ -48,7 +48,7 @@ use Illuminate\View\View;
/**
* Class ReconcileController.
*/
-class ReconcileController extends Controller
+final class ReconcileController extends Controller
{
private AccountRepositoryInterface $accountRepos;
private JournalRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php
index e44954248b..53aa10c1c1 100644
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -48,7 +48,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
use PeriodOverview;
diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php
index 36e5f3b510..a5dec3fb7c 100644
--- a/app/Http/Controllers/Admin/ConfigurationController.php
+++ b/app/Http/Controllers/Admin/ConfigurationController.php
@@ -36,7 +36,7 @@ use Illuminate\View\View;
/**
* Class ConfigurationController.
*/
-class ConfigurationController extends Controller
+final class ConfigurationController extends Controller
{
/**
* ConfigurationController constructor.
diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php
index 4567ae256e..32bc369eec 100644
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -35,7 +35,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class HomeController.
*/
-class HomeController extends Controller
+final class HomeController extends Controller
{
/**
* ConfigurationController constructor.
diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
index 4e1d97c617..2f6f87673c 100644
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -39,7 +39,7 @@ use Illuminate\View\View;
/**
* Class LinkController.
*/
-class LinkController extends Controller
+final class LinkController extends Controller
{
private LinkTypeRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Admin/NotificationController.php b/app/Http/Controllers/Admin/NotificationController.php
index 4f99aeeb61..43c92d3baa 100644
--- a/app/Http/Controllers/Admin/NotificationController.php
+++ b/app/Http/Controllers/Admin/NotificationController.php
@@ -34,7 +34,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
-class NotificationController extends Controller
+final class NotificationController extends Controller
{
public function index(): View
{
diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php
index 7f748825ec..00011f769f 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -37,7 +37,7 @@ use Illuminate\View\View;
/**
* Class HomeController.
*/
-class UpdateController extends Controller
+final class UpdateController extends Controller
{
use UpdateTrait;
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index e278d878a2..109dacab3c 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -47,7 +47,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class UserController.
*/
-class UserController extends Controller
+final class UserController extends Controller
{
protected bool $externalIdentity;
private UserRepositoryInterface $repository;
diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index dc7a4fe8e7..5bc1ae2ff2 100644
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -38,7 +38,7 @@ use Illuminate\View\View;
/**
* Class AttachmentController.
*/
-class AttachmentController extends Controller
+final class AttachmentController extends Controller
{
private AttachmentRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php
index 51232db682..cf312e78df 100644
--- a/app/Http/Controllers/Auth/ConfirmPasswordController.php
+++ b/app/Http/Controllers/Auth/ConfirmPasswordController.php
@@ -32,7 +32,7 @@ use Illuminate\Foundation\Auth\ConfirmsPasswords;
/**
* Class ConfirmPasswordController
*/
-class ConfirmPasswordController extends Controller
+final class ConfirmPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 4b654abe56..8b55d41ed1 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -43,7 +43,7 @@ use function Safe\parse_url;
/**
* Class ForgotPasswordController
*/
-class ForgotPasswordController extends Controller
+final class ForgotPasswordController extends Controller
{
use SendsPasswordResetEmails;
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index ceab4c0285..203037f1a6 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -59,7 +59,7 @@ use Symfony\Component\HttpFoundation\Response as ResponseAlias;
* redirecting them to your home screen. The controller uses a trait
* to conveniently provide its functionality to your applications.
*/
-class LoginController extends Controller
+final class LoginController extends Controller
{
use AuthenticatesUsers;
use ThrottlesLogins;
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 54c9fb3273..94a034bcbb 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -50,7 +50,7 @@ use Psr\Container\NotFoundExceptionInterface;
* validation and creation. By default this controller uses a trait to
* provide this functionality without requiring any additional code.
*/
-class RegisterController extends Controller
+final class RegisterController extends Controller
{
use CreateStuff;
use RegistersUsers;
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index cb412585bf..f20986fa60 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -46,7 +46,7 @@ use SensitiveParameter;
* and uses a simple trait to include this behavior. You're free to
* explore this trait and override any methods you wish to tweak.
*/
-class ResetPasswordController extends Controller
+final class ResetPasswordController extends Controller
{
use ResetsPasswords;
diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php
index 9db3704962..8c074382c3 100644
--- a/app/Http/Controllers/Auth/TwoFactorController.php
+++ b/app/Http/Controllers/Auth/TwoFactorController.php
@@ -44,7 +44,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class TwoFactorController.
*/
-class TwoFactorController extends Controller
+final class TwoFactorController extends Controller
{
/**
* What to do if 2FA lost?
diff --git a/app/Http/Controllers/Bill/CreateController.php b/app/Http/Controllers/Bill/CreateController.php
index 6bc9b10f08..5fbf7b1a00 100644
--- a/app/Http/Controllers/Bill/CreateController.php
+++ b/app/Http/Controllers/Bill/CreateController.php
@@ -39,7 +39,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
private AttachmentHelperInterface $attachments;
private BillRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Bill/DeleteController.php b/app/Http/Controllers/Bill/DeleteController.php
index 76a8f4afd0..059788943d 100644
--- a/app/Http/Controllers/Bill/DeleteController.php
+++ b/app/Http/Controllers/Bill/DeleteController.php
@@ -37,7 +37,7 @@ use Illuminate\View\View;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
private BillRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php
index 9581b9e568..081043c1e6 100644
--- a/app/Http/Controllers/Bill/EditController.php
+++ b/app/Http/Controllers/Bill/EditController.php
@@ -40,7 +40,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
private AttachmentHelperInterface $attachments;
private BillRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php
index 3cdf72f79a..4026a7100f 100644
--- a/app/Http/Controllers/Bill/IndexController.php
+++ b/app/Http/Controllers/Bill/IndexController.php
@@ -44,7 +44,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
use OrganisesObjectGroups;
diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php
index 702cf495cb..b312771430 100644
--- a/app/Http/Controllers/Bill/ShowController.php
+++ b/app/Http/Controllers/Bill/ShowController.php
@@ -52,7 +52,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private BillRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php
index 8f880fee29..9aac6714db 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -53,7 +53,7 @@ use Spatie\Period\Precision;
/**
* Class BudgetLimitController
*/
-class BudgetLimitController extends Controller
+final class BudgetLimitController extends Controller
{
use DateCalculation;
diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php
index b8e20e9e6d..5693a8f5a4 100644
--- a/app/Http/Controllers/Budget/CreateController.php
+++ b/app/Http/Controllers/Budget/CreateController.php
@@ -40,7 +40,7 @@ use Illuminate\View\View;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
private AttachmentHelperInterface $attachments;
private BudgetRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php
index 9f28985b2a..5a6403eb9c 100644
--- a/app/Http/Controllers/Budget/DeleteController.php
+++ b/app/Http/Controllers/Budget/DeleteController.php
@@ -37,7 +37,7 @@ use Illuminate\View\View;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
/** @var BudgetRepositoryInterface The budget repository */
private $repository;
diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php
index 8322cdd4f8..89e38dd9e0 100644
--- a/app/Http/Controllers/Budget/EditController.php
+++ b/app/Http/Controllers/Budget/EditController.php
@@ -42,7 +42,7 @@ use Illuminate\View\View;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
private AttachmentHelperInterface $attachments;
private BudgetRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php
index bae08b34f3..ad67075dc7 100644
--- a/app/Http/Controllers/Budget/ShowController.php
+++ b/app/Http/Controllers/Budget/ShowController.php
@@ -46,7 +46,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
use AugumentData;
use PeriodOverview;
diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php
index 9621e69202..6243cc5729 100644
--- a/app/Http/Controllers/Category/CreateController.php
+++ b/app/Http/Controllers/Category/CreateController.php
@@ -40,7 +40,7 @@ use Illuminate\View\View;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
private AttachmentHelperInterface $attachments;
private CategoryRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Category/DeleteController.php b/app/Http/Controllers/Category/DeleteController.php
index 998a0fb36e..095ccdfc24 100644
--- a/app/Http/Controllers/Category/DeleteController.php
+++ b/app/Http/Controllers/Category/DeleteController.php
@@ -37,7 +37,7 @@ use Illuminate\View\View;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
/** @var CategoryRepositoryInterface The category repository */
private $repository;
diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php
index 37715b788f..295443fe1d 100644
--- a/app/Http/Controllers/Category/EditController.php
+++ b/app/Http/Controllers/Category/EditController.php
@@ -40,7 +40,7 @@ use Illuminate\View\View;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
private AttachmentHelperInterface $attachments;
private CategoryRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Category/IndexController.php b/app/Http/Controllers/Category/IndexController.php
index a4e2af50db..68aed69b1a 100644
--- a/app/Http/Controllers/Category/IndexController.php
+++ b/app/Http/Controllers/Category/IndexController.php
@@ -39,7 +39,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
/** @var CategoryRepositoryInterface The category repository */
private $repository;
diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php
index db9b36a2a6..704c6cc545 100644
--- a/app/Http/Controllers/Category/NoCategoryController.php
+++ b/app/Http/Controllers/Category/NoCategoryController.php
@@ -44,7 +44,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class NoCategoryController
*/
-class NoCategoryController extends Controller
+final class NoCategoryController extends Controller
{
use PeriodOverview;
diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php
index 765c728d8c..284df55c65 100644
--- a/app/Http/Controllers/Category/ShowController.php
+++ b/app/Http/Controllers/Category/ShowController.php
@@ -42,7 +42,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
use PeriodOverview;
diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index b4416758fa..43c9b49550 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -52,7 +52,7 @@ use function Safe\json_encode;
/**
* Class AccountController.
*/
-class AccountController extends Controller
+final class AccountController extends Controller
{
use AugumentData;
use ChartGeneration;
diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php
index cc81cad6e4..a21475a114 100644
--- a/app/Http/Controllers/Chart/BillController.php
+++ b/app/Http/Controllers/Chart/BillController.php
@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class BillController.
*/
-class BillController extends Controller
+final class BillController extends Controller
{
protected GeneratorInterface $generator;
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 7cc24f4c70..70b31b50a3 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -49,7 +49,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class BudgetController.
*/
-class BudgetController extends Controller
+final class BudgetController extends Controller
{
use AugumentData;
use DateCalculation;
diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php
index 33e937edd9..5b31a0f5d7 100644
--- a/app/Http/Controllers/Chart/BudgetReportController.php
+++ b/app/Http/Controllers/Chart/BudgetReportController.php
@@ -41,7 +41,7 @@ use Illuminate\Support\Collection;
*
* Class BudgetReportController
*/
-class BudgetReportController extends Controller
+final class BudgetReportController extends Controller
{
use AugumentData;
use TransactionCalculation;
diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php
index 6ff25bc252..806e86fad8 100644
--- a/app/Http/Controllers/Chart/CategoryController.php
+++ b/app/Http/Controllers/Chart/CategoryController.php
@@ -46,7 +46,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class CategoryController.
*/
-class CategoryController extends Controller
+final class CategoryController extends Controller
{
use AugumentData;
use ChartGeneration;
diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php
index 1e8de112e1..3ce95535b9 100644
--- a/app/Http/Controllers/Chart/CategoryReportController.php
+++ b/app/Http/Controllers/Chart/CategoryReportController.php
@@ -40,7 +40,7 @@ use Illuminate\Support\Collection;
*
* Class CategoryReportController
*/
-class CategoryReportController extends Controller
+final class CategoryReportController extends Controller
{
use AugumentData;
use ResolvesJournalAmountAndCurrency;
diff --git a/app/Http/Controllers/Chart/DoubleReportController.php b/app/Http/Controllers/Chart/DoubleReportController.php
index 8219ad6501..797ff95eed 100644
--- a/app/Http/Controllers/Chart/DoubleReportController.php
+++ b/app/Http/Controllers/Chart/DoubleReportController.php
@@ -38,7 +38,7 @@ use Illuminate\Support\Collection;
/**
* Class DoubleReportController
*/
-class DoubleReportController extends Controller
+final class DoubleReportController extends Controller
{
/** @var GeneratorInterface Chart generation methods. */
private $generator;
diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php
index fb786d56f3..bb1cc16b86 100644
--- a/app/Http/Controllers/Chart/ExpenseReportController.php
+++ b/app/Http/Controllers/Chart/ExpenseReportController.php
@@ -41,7 +41,7 @@ use Illuminate\Support\Collection;
*
* Class ExpenseReportController
*/
-class ExpenseReportController extends Controller
+final class ExpenseReportController extends Controller
{
use AugumentData;
use TransactionCalculation;
diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php
index b9bb86c2f7..ea894a56f8 100644
--- a/app/Http/Controllers/Chart/PiggyBankController.php
+++ b/app/Http/Controllers/Chart/PiggyBankController.php
@@ -38,7 +38,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class PiggyBankController.
*/
-class PiggyBankController extends Controller
+final class PiggyBankController extends Controller
{
use DateCalculation;
diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php
index f6c0d419d5..4b27ed75c0 100644
--- a/app/Http/Controllers/Chart/ReportController.php
+++ b/app/Http/Controllers/Chart/ReportController.php
@@ -44,7 +44,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class ReportController.
*/
-class ReportController extends Controller
+final class ReportController extends Controller
{
use BasicDataSupport;
use ChartGeneration;
diff --git a/app/Http/Controllers/Chart/TagReportController.php b/app/Http/Controllers/Chart/TagReportController.php
index d11ced17ca..79e8898246 100644
--- a/app/Http/Controllers/Chart/TagReportController.php
+++ b/app/Http/Controllers/Chart/TagReportController.php
@@ -37,7 +37,7 @@ use Illuminate\Support\Collection;
/**
* Class TagReportController
*/
-class TagReportController extends Controller
+final class TagReportController extends Controller
{
use AugumentData;
use ResolvesJournalAmountAndCurrency;
diff --git a/app/Http/Controllers/Chart/TransactionController.php b/app/Http/Controllers/Chart/TransactionController.php
index f54a71b0dc..3462e7f0da 100644
--- a/app/Http/Controllers/Chart/TransactionController.php
+++ b/app/Http/Controllers/Chart/TransactionController.php
@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class TransactionController
*/
-class TransactionController extends Controller
+final class TransactionController extends Controller
{
use ResolvesJournalAmountAndCurrency;
diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php
index f4d7ae994a..87a9a47e3d 100644
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -62,7 +62,7 @@ use const PHP_SAPI;
/**
* Class DebugController
*/
-class DebugController extends Controller
+final class DebugController extends Controller
{
use GetConfigurationData;
@@ -195,9 +195,7 @@ class DebugController extends Controller
}
// no name route:
if (null === $route->getName()) {
- var_dump($route);
-
- exit;
+ die('Route name is NULL, cannot deal with this.');
}
echo substr($route->uri(), 3);
@@ -236,9 +234,7 @@ class DebugController extends Controller
}
// no name route:
if (null === $route->getName()) {
- var_dump($route);
-
- exit;
+ die('Route name is NULL, cannot deal with this.');
}
if (!str_contains($route->uri(), '{')) {
$return[$route->getName()] = route($route->getName());
diff --git a/app/Http/Controllers/ExchangeRates/IndexController.php b/app/Http/Controllers/ExchangeRates/IndexController.php
index cc746bcf3c..e0ba7765da 100644
--- a/app/Http/Controllers/ExchangeRates/IndexController.php
+++ b/app/Http/Controllers/ExchangeRates/IndexController.php
@@ -30,7 +30,7 @@ use FireflyIII\Support\Facades\FireflyConfig;
use Illuminate\View\View;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-class IndexController extends Controller
+final class IndexController extends Controller
{
/**
* AttachmentController constructor.
diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.php
index cc0903e402..9bfc47e90f 100644
--- a/app/Http/Controllers/Export/IndexController.php
+++ b/app/Http/Controllers/Export/IndexController.php
@@ -40,7 +40,7 @@ use Illuminate\View\View;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
private JournalRepositoryInterface $journalRepository;
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index f005a7aab4..ab85c19525 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -43,7 +43,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class HomeController.
*/
-class HomeController extends Controller
+final class HomeController extends Controller
{
/**
* HomeController constructor.
diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php
index a6aea3ccbf..2cf17dcf6c 100644
--- a/app/Http/Controllers/JavascriptController.php
+++ b/app/Http/Controllers/JavascriptController.php
@@ -42,7 +42,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class JavascriptController.
*/
-class JavascriptController extends Controller
+final class JavascriptController extends Controller
{
use GetConfigurationData;
diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php
index b749d626ad..8a0ec7eafe 100644
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -28,4 +28,4 @@ use FireflyIII\Http\Controllers\Controller;
/**
* Class AutoCompleteController.
*/
-class AutoCompleteController extends Controller {}
+final class AutoCompleteController extends Controller {}
diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php
index 4f88b98e31..623dcbd35e 100644
--- a/app/Http/Controllers/Json/BoxController.php
+++ b/app/Http/Controllers/Json/BoxController.php
@@ -43,7 +43,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class BoxController.
*/
-class BoxController extends Controller
+final class BoxController extends Controller
{
use DateCalculation;
diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.php
index 985059bc18..df18af267e 100644
--- a/app/Http/Controllers/Json/BudgetController.php
+++ b/app/Http/Controllers/Json/BudgetController.php
@@ -38,7 +38,7 @@ use Illuminate\Http\JsonResponse;
/**
* Class BudgetController
*/
-class BudgetController extends Controller
+final class BudgetController extends Controller
{
use DateCalculation;
diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.php
index 3072be7416..75b95fc278 100644
--- a/app/Http/Controllers/Json/FrontpageController.php
+++ b/app/Http/Controllers/Json/FrontpageController.php
@@ -34,7 +34,7 @@ use Throwable;
/**
* Class FrontpageController.
*/
-class FrontpageController extends Controller
+final class FrontpageController extends Controller
{
/**
* Piggy bank pie chart.
diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php
index c045981885..5458f465c3 100644
--- a/app/Http/Controllers/Json/IntroController.php
+++ b/app/Http/Controllers/Json/IntroController.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class IntroController.
*/
-class IntroController extends Controller
+final class IntroController extends Controller
{
use GetConfigurationData;
diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php
index 14d2ce460b..27e675a53b 100644
--- a/app/Http/Controllers/Json/ReconcileController.php
+++ b/app/Http/Controllers/Json/ReconcileController.php
@@ -42,7 +42,7 @@ use Throwable;
/**
* Class ReconcileController
*/
-class ReconcileController extends Controller
+final class ReconcileController extends Controller
{
private AccountRepositoryInterface $accountRepos;
diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php
index 6cb301a44c..b5c1e61f0f 100644
--- a/app/Http/Controllers/Json/RecurrenceController.php
+++ b/app/Http/Controllers/Json/RecurrenceController.php
@@ -38,7 +38,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class RecurrenceController
*/
-class RecurrenceController extends Controller
+final class RecurrenceController extends Controller
{
private RecurringRepositoryInterface $recurring;
diff --git a/app/Http/Controllers/Json/RuleController.php b/app/Http/Controllers/Json/RuleController.php
index 64d42e318b..bdac5794e0 100644
--- a/app/Http/Controllers/Json/RuleController.php
+++ b/app/Http/Controllers/Json/RuleController.php
@@ -34,7 +34,7 @@ use Throwable;
/**
* Class RuleController
*/
-class RuleController extends Controller
+final class RuleController extends Controller
{
/**
* Render HTML form for rule action.
diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php
index 905ff872a3..351c7b76c7 100644
--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -38,7 +38,7 @@ use Illuminate\View\View;
/**
* Class NewUserController.
*/
-class NewUserController extends Controller
+final class NewUserController extends Controller
{
use CreateStuff;
diff --git a/app/Http/Controllers/ObjectGroup/DeleteController.php b/app/Http/Controllers/ObjectGroup/DeleteController.php
index be322ed949..8bc49ff4fa 100644
--- a/app/Http/Controllers/ObjectGroup/DeleteController.php
+++ b/app/Http/Controllers/ObjectGroup/DeleteController.php
@@ -35,7 +35,7 @@ use Illuminate\Http\RedirectResponse;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
private ObjectGroupRepositoryInterface $repository;
diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php
index c0e16e36ee..2a254e5b10 100644
--- a/app/Http/Controllers/ObjectGroup/EditController.php
+++ b/app/Http/Controllers/ObjectGroup/EditController.php
@@ -38,7 +38,7 @@ use Illuminate\Routing\Redirector;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
private ObjectGroupRepositoryInterface $repository;
diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.php
index 7d5c7221f0..14a5a4786c 100644
--- a/app/Http/Controllers/ObjectGroup/IndexController.php
+++ b/app/Http/Controllers/ObjectGroup/IndexController.php
@@ -36,7 +36,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
private ObjectGroupRepositoryInterface $repository;
diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php
index acd50dedef..2679b0ed37 100644
--- a/app/Http/Controllers/PiggyBank/AmountController.php
+++ b/app/Http/Controllers/PiggyBank/AmountController.php
@@ -40,7 +40,7 @@ use Illuminate\View\View;
/**
* Class AmountController
*/
-class AmountController extends Controller
+final class AmountController extends Controller
{
private PiggyBankRepositoryInterface $piggyRepos;
diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php
index 0da83ba343..ee3378a5ea 100644
--- a/app/Http/Controllers/PiggyBank/CreateController.php
+++ b/app/Http/Controllers/PiggyBank/CreateController.php
@@ -40,7 +40,7 @@ use Illuminate\View\View;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
private AttachmentHelperInterface $attachments;
private PiggyBankRepositoryInterface $piggyRepos;
diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.php
index 6c21fe504b..973b1047fe 100644
--- a/app/Http/Controllers/PiggyBank/DeleteController.php
+++ b/app/Http/Controllers/PiggyBank/DeleteController.php
@@ -35,7 +35,7 @@ use Illuminate\View\View;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
private PiggyBankRepositoryInterface $piggyRepos;
diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php
index b94b6ee88a..3e3b419620 100644
--- a/app/Http/Controllers/PiggyBank/EditController.php
+++ b/app/Http/Controllers/PiggyBank/EditController.php
@@ -40,7 +40,7 @@ use Illuminate\View\View;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
private AttachmentHelperInterface $attachments;
private PiggyBankRepositoryInterface $piggyRepos;
diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php
index 53637e1f20..afa327284a 100644
--- a/app/Http/Controllers/PiggyBank/IndexController.php
+++ b/app/Http/Controllers/PiggyBank/IndexController.php
@@ -45,7 +45,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
use OrganisesObjectGroups;
diff --git a/app/Http/Controllers/PiggyBank/ShowController.php b/app/Http/Controllers/PiggyBank/ShowController.php
index 8d5d9aad37..efbe6c590e 100644
--- a/app/Http/Controllers/PiggyBank/ShowController.php
+++ b/app/Http/Controllers/PiggyBank/ShowController.php
@@ -39,7 +39,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private PiggyBankRepositoryInterface $piggyRepos;
diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php
index 7cbaf063db..621f80020b 100644
--- a/app/Http/Controllers/Popup/ReportController.php
+++ b/app/Http/Controllers/Popup/ReportController.php
@@ -32,7 +32,7 @@ use Illuminate\Http\Request;
/**
* Class ReportController.
*/
-class ReportController extends Controller
+final class ReportController extends Controller
{
use RenderPartialViews;
diff --git a/app/Http/Controllers/Preferences/NotificationsController.php b/app/Http/Controllers/Preferences/NotificationsController.php
index 3d416ec136..8b6c8dd8c6 100644
--- a/app/Http/Controllers/Preferences/NotificationsController.php
+++ b/app/Http/Controllers/Preferences/NotificationsController.php
@@ -26,4 +26,4 @@ namespace FireflyIII\Http\Controllers\Preferences;
use FireflyIII\Http\Controllers\Controller;
-class NotificationsController extends Controller {}
+final class NotificationsController extends Controller {}
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index 7866ccfb86..3e4db560f2 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -52,7 +52,7 @@ use function Safe\json_decode;
/**
* Class PreferencesController.
*/
-class PreferencesController extends Controller
+final class PreferencesController extends Controller
{
/**
* PreferencesController constructor.
diff --git a/app/Http/Controllers/Profile/MfaController.php b/app/Http/Controllers/Profile/MfaController.php
index ac491d3a63..f9acb164ae 100644
--- a/app/Http/Controllers/Profile/MfaController.php
+++ b/app/Http/Controllers/Profile/MfaController.php
@@ -58,7 +58,7 @@ use Psr\Container\NotFoundExceptionInterface;
* Page 3 (GET): Confirm 2FA status and show recovery codes.
* Same page as page 1, but when secret is present.
*/
-class MfaController extends Controller
+final class MfaController extends Controller
{
protected bool $internalAuth;
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 1f6c466f4e..7c7823c3fd 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -59,7 +59,7 @@ use SensitiveParameter;
*
* @method Guard guard()
*/
-class ProfileController extends Controller
+final class ProfileController extends Controller
{
use CreateStuff;
diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php
index eebc80e5ed..c220ee6f5e 100644
--- a/app/Http/Controllers/Recurring/CreateController.php
+++ b/app/Http/Controllers/Recurring/CreateController.php
@@ -45,7 +45,7 @@ use Illuminate\View\View;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
private AttachmentHelperInterface $attachments;
private BillRepositoryInterface $billRepository;
diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php
index 82de7747eb..26b3e585fe 100644
--- a/app/Http/Controllers/Recurring/DeleteController.php
+++ b/app/Http/Controllers/Recurring/DeleteController.php
@@ -37,7 +37,7 @@ use Illuminate\View\View;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
private RecurringRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php
index 42be36daea..625e802286 100644
--- a/app/Http/Controllers/Recurring/EditController.php
+++ b/app/Http/Controllers/Recurring/EditController.php
@@ -49,7 +49,7 @@ use Illuminate\View\View;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
private AttachmentHelperInterface $attachments;
private BillRepositoryInterface $billRepository;
diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php
index 97583403b4..b828cd9de6 100644
--- a/app/Http/Controllers/Recurring/IndexController.php
+++ b/app/Http/Controllers/Recurring/IndexController.php
@@ -44,7 +44,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
use GetConfigurationData;
diff --git a/app/Http/Controllers/Recurring/ShowController.php b/app/Http/Controllers/Recurring/ShowController.php
index 55940add74..985959628e 100644
--- a/app/Http/Controllers/Recurring/ShowController.php
+++ b/app/Http/Controllers/Recurring/ShowController.php
@@ -43,7 +43,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
use GetConfigurationData;
diff --git a/app/Http/Controllers/Recurring/TriggerController.php b/app/Http/Controllers/Recurring/TriggerController.php
index 15f3f60b87..de0445debc 100644
--- a/app/Http/Controllers/Recurring/TriggerController.php
+++ b/app/Http/Controllers/Recurring/TriggerController.php
@@ -37,7 +37,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class TriggerController
*/
-class TriggerController extends Controller
+final class TriggerController extends Controller
{
private RecurringRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php
index d276a6eca2..4c76ad7795 100644
--- a/app/Http/Controllers/Report/AccountController.php
+++ b/app/Http/Controllers/Report/AccountController.php
@@ -35,7 +35,7 @@ use Throwable;
/**
* Class AccountController.
*/
-class AccountController extends Controller
+final class AccountController extends Controller
{
/**
* Show partial overview for account balances.
diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php
index 7c15c74252..b51be4e560 100644
--- a/app/Http/Controllers/Report/BalanceController.php
+++ b/app/Http/Controllers/Report/BalanceController.php
@@ -38,7 +38,7 @@ use Throwable;
/**
* Class BalanceController.
*/
-class BalanceController extends Controller
+final class BalanceController extends Controller
{
/** @var BudgetRepositoryInterface */
private $repository;
diff --git a/app/Http/Controllers/Report/BillController.php b/app/Http/Controllers/Report/BillController.php
index b27c816a56..03bc1f12f0 100644
--- a/app/Http/Controllers/Report/BillController.php
+++ b/app/Http/Controllers/Report/BillController.php
@@ -36,7 +36,7 @@ use Throwable;
/**
* Class BillController
*/
-class BillController extends Controller
+final class BillController extends Controller
{
/**
* @return mixed|string
diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php
index 855a531612..5691a50098 100644
--- a/app/Http/Controllers/Report/BudgetController.php
+++ b/app/Http/Controllers/Report/BudgetController.php
@@ -42,7 +42,7 @@ use Throwable;
/**
* Class BudgetController.
*/
-class BudgetController extends Controller
+final class BudgetController extends Controller
{
use BasicDataSupport;
diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php
index 461aba080f..6e087d2be4 100644
--- a/app/Http/Controllers/Report/CategoryController.php
+++ b/app/Http/Controllers/Report/CategoryController.php
@@ -43,7 +43,7 @@ use Throwable;
/**
* Class CategoryController.
*/
-class CategoryController extends Controller
+final class CategoryController extends Controller
{
use BasicDataSupport;
diff --git a/app/Http/Controllers/Report/DoubleController.php b/app/Http/Controllers/Report/DoubleController.php
index 8cc6d652b6..31a0cdb66e 100644
--- a/app/Http/Controllers/Report/DoubleController.php
+++ b/app/Http/Controllers/Report/DoubleController.php
@@ -39,7 +39,7 @@ use Throwable;
/**
* Class DoubleController
*/
-class DoubleController extends Controller
+final class DoubleController extends Controller
{
use AugumentData;
diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php
index 7769bcdf80..8ab086b837 100644
--- a/app/Http/Controllers/Report/OperationsController.php
+++ b/app/Http/Controllers/Report/OperationsController.php
@@ -35,7 +35,7 @@ use Throwable;
/**
* Class OperationsController.
*/
-class OperationsController extends Controller
+final class OperationsController extends Controller
{
/** @var AccountTaskerInterface Some specific account things. */
private $tasker;
diff --git a/app/Http/Controllers/Report/TagController.php b/app/Http/Controllers/Report/TagController.php
index 9d4fcd6c0a..8656d57f34 100644
--- a/app/Http/Controllers/Report/TagController.php
+++ b/app/Http/Controllers/Report/TagController.php
@@ -39,7 +39,7 @@ use Throwable;
/**
* Class TagController
*/
-class TagController extends Controller
+final class TagController extends Controller
{
private OperationsRepositoryInterface $opsRepository;
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 54513e194f..be2ae16b8d 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -47,7 +47,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class ReportController.
*/
-class ReportController extends Controller
+final class ReportController extends Controller
{
use RenderPartialViews;
diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php
index 0dd94fa856..a0d77f7765 100644
--- a/app/Http/Controllers/Rule/CreateController.php
+++ b/app/Http/Controllers/Rule/CreateController.php
@@ -46,7 +46,7 @@ use Illuminate\View\View;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
use ModelInformation;
use RuleManagement;
diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php
index d76a293f41..bc420f1a4a 100644
--- a/app/Http/Controllers/Rule/DeleteController.php
+++ b/app/Http/Controllers/Rule/DeleteController.php
@@ -35,7 +35,7 @@ use Illuminate\View\View;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
/** @var RuleRepositoryInterface Rule repository */
private $ruleRepos;
diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php
index d06faa9e6e..18fc2be5ad 100644
--- a/app/Http/Controllers/Rule/EditController.php
+++ b/app/Http/Controllers/Rule/EditController.php
@@ -45,7 +45,7 @@ use Throwable;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
use RenderPartialViews;
use RuleManagement;
diff --git a/app/Http/Controllers/Rule/IndexController.php b/app/Http/Controllers/Rule/IndexController.php
index ea33e10e9c..9be63ba5a0 100644
--- a/app/Http/Controllers/Rule/IndexController.php
+++ b/app/Http/Controllers/Rule/IndexController.php
@@ -38,7 +38,7 @@ use Illuminate\View\View;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
use RuleManagement;
diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php
index 0f5bc32464..e5d10a9cfc 100644
--- a/app/Http/Controllers/Rule/SelectController.php
+++ b/app/Http/Controllers/Rule/SelectController.php
@@ -45,7 +45,7 @@ use Throwable;
/**
* Class SelectController.
*/
-class SelectController extends Controller
+final class SelectController extends Controller
{
use RuleManagement;
diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.php
index cb063c6a35..030a0279c4 100644
--- a/app/Http/Controllers/RuleGroup/CreateController.php
+++ b/app/Http/Controllers/RuleGroup/CreateController.php
@@ -36,7 +36,7 @@ use Illuminate\View\View;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
/** @var RuleGroupRepositoryInterface */
private $repository;
diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.php
index 9da90c8047..2a10388da0 100644
--- a/app/Http/Controllers/RuleGroup/DeleteController.php
+++ b/app/Http/Controllers/RuleGroup/DeleteController.php
@@ -37,7 +37,7 @@ use Illuminate\View\View;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
/** @var RuleGroupRepositoryInterface */
private $repository;
diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php
index bb2cab2cbb..018183191c 100644
--- a/app/Http/Controllers/RuleGroup/EditController.php
+++ b/app/Http/Controllers/RuleGroup/EditController.php
@@ -39,7 +39,7 @@ use Illuminate\View\View;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
private RuleGroupRepositoryInterface $repository;
diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.php
index 3845bd0e55..a6883c45f8 100644
--- a/app/Http/Controllers/RuleGroup/ExecutionController.php
+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php
@@ -41,7 +41,7 @@ use Illuminate\View\View;
/**
* Class ExecutionController
*/
-class ExecutionController extends Controller
+final class ExecutionController extends Controller
{
private readonly AccountRepositoryInterface $repository;
private readonly RuleGroupRepositoryInterface $ruleGroupRepository;
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 39cadb753f..3287c2f109 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -36,7 +36,7 @@ use Throwable;
/**
* Class SearchController.
*/
-class SearchController extends Controller
+final class SearchController extends Controller
{
/**
* SearchController constructor.
diff --git a/app/Http/Controllers/System/CronController.php b/app/Http/Controllers/System/CronController.php
index 95317da085..5ec33780f7 100644
--- a/app/Http/Controllers/System/CronController.php
+++ b/app/Http/Controllers/System/CronController.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Log;
/**
* Class CronController
*/
-class CronController
+final class CronController
{
/**
* @return Application|Response|ResponseFactory
diff --git a/app/Http/Controllers/System/HealthcheckController.php b/app/Http/Controllers/System/HealthcheckController.php
index 8bec13fcd9..bf1738412c 100644
--- a/app/Http/Controllers/System/HealthcheckController.php
+++ b/app/Http/Controllers/System/HealthcheckController.php
@@ -30,7 +30,7 @@ use Illuminate\Http\Response;
/**
* Class HealthcheckController.
*/
-class HealthcheckController extends Controller
+final class HealthcheckController extends Controller
{
/**
* Sends 'OK' info when app is alive
diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php
index b512f01b52..4aadad8e38 100644
--- a/app/Http/Controllers/System/InstallController.php
+++ b/app/Http/Controllers/System/InstallController.php
@@ -45,7 +45,7 @@ use function Safe\file_put_contents;
/**
* Class InstallController
*/
-class InstallController extends Controller
+final class InstallController extends Controller
{
use GetConfigurationData;
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 513c018e1c..29ac17e82b 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -44,7 +44,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class TagController.
*/
-class TagController extends Controller
+final class TagController extends Controller
{
use PeriodOverview;
diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php
index 8a0e955fd1..7387076eb2 100644
--- a/app/Http/Controllers/Transaction/BulkController.php
+++ b/app/Http/Controllers/Transaction/BulkController.php
@@ -45,7 +45,7 @@ use Illuminate\View\View;
/**
* Class BulkController
*/
-class BulkController extends Controller
+final class BulkController extends Controller
{
/** @var JournalRepositoryInterface Journals and transactions overview */
private $repository;
diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index 767945598b..53f1ed5438 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -58,7 +58,7 @@ use Illuminate\View\View;
*
* TODO when converting a split transfer, all sources and destinations must be the same.
*/
-class ConvertController extends Controller
+final class ConvertController extends Controller
{
use ModelInformation;
diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php
index 278051c120..3677d3403a 100644
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -44,7 +44,7 @@ use function Safe\parse_url;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
private TransactionGroupRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php
index 5cc39fb0e7..26f60809be 100644
--- a/app/Http/Controllers/Transaction/DeleteController.php
+++ b/app/Http/Controllers/Transaction/DeleteController.php
@@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
private TransactionGroupRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php
index 67d2853f99..f9feb24a58 100644
--- a/app/Http/Controllers/Transaction/EditController.php
+++ b/app/Http/Controllers/Transaction/EditController.php
@@ -45,7 +45,7 @@ use function Safe\parse_url;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
private JournalRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.php
index aaa6c3f0a5..b11c67c82a 100644
--- a/app/Http/Controllers/Transaction/IndexController.php
+++ b/app/Http/Controllers/Transaction/IndexController.php
@@ -41,7 +41,7 @@ use Psr\Container\NotFoundExceptionInterface;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
use PeriodOverview;
diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 6e9a7923d1..08f9409fd2 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -41,7 +41,7 @@ use Illuminate\View\View;
/**
* Class LinkController.
*/
-class LinkController extends Controller
+final class LinkController extends Controller
{
private JournalRepositoryInterface $journalRepository;
private LinkTypeRepositoryInterface $repository;
diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php
index 61cda0cd88..09cd64f9aa 100644
--- a/app/Http/Controllers/Transaction/MassController.php
+++ b/app/Http/Controllers/Transaction/MassController.php
@@ -51,7 +51,7 @@ use InvalidArgumentException;
/**
* Class MassController.
*/
-class MassController extends Controller
+final class MassController extends Controller
{
private JournalRepositoryInterface $repository;
@@ -180,8 +180,8 @@ class MassController extends Controller
try {
$this->updateJournal($integer, $request);
++$count;
- } catch (FireflyException) {
- // @ignoreException
+ } catch (FireflyException $e) {
+ Log::debug(sprintf('Could not update journal #%d: %s', $integer, $e->getMessage()));
}
}
diff --git a/app/Http/Controllers/Transaction/ShowController.php b/app/Http/Controllers/Transaction/ShowController.php
index 98908a51ad..4c47d1571e 100644
--- a/app/Http/Controllers/Transaction/ShowController.php
+++ b/app/Http/Controllers/Transaction/ShowController.php
@@ -43,7 +43,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
private ALERepositoryInterface $aleRepository;
private TransactionGroupRepositoryInterface $repository;
diff --git a/app/Http/Controllers/TransactionCurrency/CreateController.php b/app/Http/Controllers/TransactionCurrency/CreateController.php
index 8977be88ac..542fc18f11 100644
--- a/app/Http/Controllers/TransactionCurrency/CreateController.php
+++ b/app/Http/Controllers/TransactionCurrency/CreateController.php
@@ -41,7 +41,7 @@ use Illuminate\View\View;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
protected CurrencyRepositoryInterface $repository;
protected UserRepositoryInterface $userRepository;
diff --git a/app/Http/Controllers/TransactionCurrency/DeleteController.php b/app/Http/Controllers/TransactionCurrency/DeleteController.php
index 97ba8b8eba..b489d87048 100644
--- a/app/Http/Controllers/TransactionCurrency/DeleteController.php
+++ b/app/Http/Controllers/TransactionCurrency/DeleteController.php
@@ -40,7 +40,7 @@ use Illuminate\View\View;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
protected CurrencyRepositoryInterface $repository;
protected UserRepositoryInterface $userRepository;
diff --git a/app/Http/Controllers/TransactionCurrency/EditController.php b/app/Http/Controllers/TransactionCurrency/EditController.php
index 276d525ec1..3d3fbe7852 100644
--- a/app/Http/Controllers/TransactionCurrency/EditController.php
+++ b/app/Http/Controllers/TransactionCurrency/EditController.php
@@ -39,7 +39,7 @@ use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
-class EditController extends Controller
+final class EditController extends Controller
{
protected CurrencyRepositoryInterface $repository;
protected UserRepositoryInterface $userRepository;
diff --git a/app/Http/Controllers/TransactionCurrency/IndexController.php b/app/Http/Controllers/TransactionCurrency/IndexController.php
index 40ee7acb68..68523fad38 100644
--- a/app/Http/Controllers/TransactionCurrency/IndexController.php
+++ b/app/Http/Controllers/TransactionCurrency/IndexController.php
@@ -37,7 +37,7 @@ use Illuminate\View\View;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
-class IndexController extends Controller
+final class IndexController extends Controller
{
protected CurrencyRepositoryInterface $repository;
protected UserRepositoryInterface $userRepository;
diff --git a/app/Http/Controllers/UserGroup/CreateController.php b/app/Http/Controllers/UserGroup/CreateController.php
index 253e0f293d..3ab342db6a 100644
--- a/app/Http/Controllers/UserGroup/CreateController.php
+++ b/app/Http/Controllers/UserGroup/CreateController.php
@@ -30,7 +30,7 @@ use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Application;
use Illuminate\Support\Facades\Log;
-class CreateController extends Controller
+final class CreateController extends Controller
{
/**
* @return Application|Factory|\Illuminate\Contracts\Foundation\Application|View
diff --git a/app/Http/Controllers/UserGroup/EditController.php b/app/Http/Controllers/UserGroup/EditController.php
index 7ef7f96aef..7340b934fd 100644
--- a/app/Http/Controllers/UserGroup/EditController.php
+++ b/app/Http/Controllers/UserGroup/EditController.php
@@ -31,7 +31,7 @@ use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Application;
use Illuminate\Support\Facades\Log;
-class EditController extends Controller
+final class EditController extends Controller
{
/**
* @return Application|Factory|\Illuminate\Contracts\Foundation\Application|View
diff --git a/app/Http/Controllers/UserGroup/IndexController.php b/app/Http/Controllers/UserGroup/IndexController.php
index b782463c2f..8a02f67fbb 100644
--- a/app/Http/Controllers/UserGroup/IndexController.php
+++ b/app/Http/Controllers/UserGroup/IndexController.php
@@ -30,7 +30,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
-class IndexController extends Controller
+final class IndexController extends Controller
{
/**
* Show all administrations.
diff --git a/app/Http/Controllers/Webhooks/CreateController.php b/app/Http/Controllers/Webhooks/CreateController.php
index 1f39976a2e..1859a4ae61 100644
--- a/app/Http/Controllers/Webhooks/CreateController.php
+++ b/app/Http/Controllers/Webhooks/CreateController.php
@@ -34,7 +34,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class CreateController
*/
-class CreateController extends Controller
+final class CreateController extends Controller
{
public function __construct()
{
diff --git a/app/Http/Controllers/Webhooks/DeleteController.php b/app/Http/Controllers/Webhooks/DeleteController.php
index 32072fde5a..d899aafacf 100644
--- a/app/Http/Controllers/Webhooks/DeleteController.php
+++ b/app/Http/Controllers/Webhooks/DeleteController.php
@@ -36,7 +36,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class DeleteController
*/
-class DeleteController extends Controller
+final class DeleteController extends Controller
{
/**
* DeleteController constructor.
diff --git a/app/Http/Controllers/Webhooks/EditController.php b/app/Http/Controllers/Webhooks/EditController.php
index 553d0dbf28..9f949669dd 100644
--- a/app/Http/Controllers/Webhooks/EditController.php
+++ b/app/Http/Controllers/Webhooks/EditController.php
@@ -36,7 +36,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class EditController
*/
-class EditController extends Controller
+final class EditController extends Controller
{
/**
* DeleteController constructor.
diff --git a/app/Http/Controllers/Webhooks/IndexController.php b/app/Http/Controllers/Webhooks/IndexController.php
index efed505c43..e84a5daffe 100644
--- a/app/Http/Controllers/Webhooks/IndexController.php
+++ b/app/Http/Controllers/Webhooks/IndexController.php
@@ -34,7 +34,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class IndexController
*/
-class IndexController extends Controller
+final class IndexController extends Controller
{
public function __construct()
{
diff --git a/app/Http/Controllers/Webhooks/ShowController.php b/app/Http/Controllers/Webhooks/ShowController.php
index 1fb696a585..53d45a1794 100644
--- a/app/Http/Controllers/Webhooks/ShowController.php
+++ b/app/Http/Controllers/Webhooks/ShowController.php
@@ -36,7 +36,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class ShowController
*/
-class ShowController extends Controller
+final class ShowController extends Controller
{
/**
* DeleteController constructor.
diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php
index fe376618f0..7e1b56da05 100644
--- a/app/Providers/FireflyServiceProvider.php
+++ b/app/Providers/FireflyServiceProvider.php
@@ -54,7 +54,6 @@ use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
use FireflyIII\Repositories\Webhook\WebhookRepository;
use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
use FireflyIII\Services\FireflyIIIOrg\Update\GitHubUpdateRequest;
-use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequest;
use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface;
use FireflyIII\Services\Password\PwndVerifierV2;
use FireflyIII\Services\Password\Verifier;
diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php
index 38a6dec3c2..a1246ca38f 100644
--- a/app/Repositories/Attachment/AttachmentRepository.php
+++ b/app/Repositories/Attachment/AttachmentRepository.php
@@ -58,8 +58,8 @@ class AttachmentRepository implements AttachmentRepositoryInterface, UserGroupIn
try {
Storage::disk('upload')->delete($path);
- } catch (UnableToDeleteFile) {
- // @ignoreException
+ } catch (UnableToDeleteFile $e) {
+ Log::error(sprintf('Unable to delete file "%s": %s', $path, $e->getMessage()));
}
$attachment->delete();
diff --git a/app/Support/JsonApi/Enrichments/CategoryEnrichment.php b/app/Support/JsonApi/Enrichments/CategoryEnrichment.php
index afd9caf2ce..a9523ae223 100644
--- a/app/Support/JsonApi/Enrichments/CategoryEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/CategoryEnrichment.php
@@ -32,23 +32,22 @@ use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Log;
class CategoryEnrichment implements EnrichmentInterface
{
private Collection $collection;
- private array $earned = [];
- private ?Carbon $end = null;
- private array $ids = [];
- private array $notes = [];
- private array $pcEarned = [];
- private array $pcSpent = [];
- private array $pcTransfers = [];
- private array $spent = [];
- private ?Carbon $start = null;
- private array $transfers = [];
- private User $user;
- private UserGroup $userGroup;
+ private array $earned = [];
+ private ?Carbon $end = null;
+ private array $ids = [];
+ private array $notes = [];
+ private array $pcEarned = [];
+ private array $pcSpent = [];
+ private array $pcTransfers = [];
+ private array $spent = [];
+ private ?Carbon $start = null;
+ private array $transfers = [];
+ private User $user;
+ private UserGroup $userGroup;
public function enrich(Collection $collection): Collection
{
@@ -61,7 +60,7 @@ class CategoryEnrichment implements EnrichmentInterface
return $collection;
}
- public function enrichSingle(array|Model $model): array|Model
+ public function enrichSingle(array | Model $model): array | Model
{
// Log::debug(__METHOD__);
$collection = new Collection()->push($model);
@@ -94,7 +93,7 @@ class CategoryEnrichment implements EnrichmentInterface
private function appendCollectedData(): void
{
$this->collection = $this->collection->map(function (Category $item): Category {
- $id = (int) $item->id;
+ $id = (int)$item->id;
$meta = [
'notes' => $this->notes[$id] ?? null,
'spent' => $this->spent[$id] ?? null,
@@ -114,7 +113,7 @@ class CategoryEnrichment implements EnrichmentInterface
{
/** @var Category $category */
foreach ($this->collection as $category) {
- $this->ids[] = (int) $category->id;
+ $this->ids[] = (int)$category->id;
}
$this->ids = array_unique($this->ids);
}
@@ -122,15 +121,14 @@ class CategoryEnrichment implements EnrichmentInterface
private function collectNotes(): void
{
$notes = Note::query()
- ->whereIn('noteable_id', $this->ids)
- ->whereNotNull('notes.text')
- ->where('notes.text', '!=', '')
- ->where('noteable_type', Category::class)
- ->get(['notes.noteable_id', 'notes.text'])
- ->toArray()
- ;
+ ->whereIn('noteable_id', $this->ids)
+ ->whereNotNull('notes.text')
+ ->where('notes.text', '!=', '')
+ ->where('noteable_type', Category::class)
+ ->get(['notes.noteable_id', 'notes.text'])
+ ->toArray();
foreach ($notes as $note) {
- $this->notes[(int) $note['noteable_id']] = (string) $note['text'];
+ $this->notes[(int)$note['noteable_id']] = (string)$note['text'];
}
// Log::debug(sprintf('Enrich with %d note(s)', count($this->notes)));
@@ -143,11 +141,11 @@ class CategoryEnrichment implements EnrichmentInterface
$opsRepository = app(OperationsRepositoryInterface::class);
$opsRepository->setUser($this->user);
$opsRepository->setUserGroup($this->userGroup);
- $expenses = $opsRepository->collectExpenses($this->start, $this->end, null, $this->collection);
- $income = $opsRepository->collectIncome($this->start, $this->end, null, $this->collection);
- $transfers = $opsRepository->collectTransfers($this->start, $this->end, null, $this->collection);
+ $expenses = $opsRepository->collectExpenses($this->start, $this->end, null, $this->collection);
+ $income = $opsRepository->collectIncome($this->start, $this->end, null, $this->collection);
+ $transfers = $opsRepository->collectTransfers($this->start, $this->end, null, $this->collection);
foreach ($this->collection as $item) {
- $id = (int) $item->id;
+ $id = (int)$item->id;
$this->spent[$id] = array_values($opsRepository->sumCollectedTransactionsByCategory($expenses, $item, 'negative'));
$this->pcSpent[$id] = array_values($opsRepository->sumCollectedTransactionsByCategory($expenses, $item, 'negative', true));
$this->earned[$id] = array_values($opsRepository->sumCollectedTransactionsByCategory($income, $item, 'positive'));
diff --git a/database/migrations/2016_06_16_000000_create_support_tables.php b/database/migrations/2016_06_16_000000_create_support_tables.php
index 4d70e4f708..47cd964a7a 100644
--- a/database/migrations/2016_06_16_000000_create_support_tables.php
+++ b/database/migrations/2016_06_16_000000_create_support_tables.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class CreateSupportTables extends Migration
+return new class extends Migration
{
private const TABLE_ALREADY_EXISTS = 'If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.';
private const TABLE_ERROR = 'Could not create table "%s": %s';
@@ -265,4 +265,4 @@ class CreateSupportTables extends Migration
}
}
}
-}
+};
diff --git a/database/migrations/2016_06_16_000001_create_users_table.php b/database/migrations/2016_06_16_000001_create_users_table.php
index 77456b38ae..191dbd7871 100644
--- a/database/migrations/2016_06_16_000001_create_users_table.php
+++ b/database/migrations/2016_06_16_000001_create_users_table.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class CreateUsersTable extends Migration
+return new class extends Migration
{
private const TABLE_ALREADY_EXISTS = 'If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.';
private const TABLE_ERROR = 'Could not create table "%s": %s';
@@ -70,3 +70,4 @@ class CreateUsersTable extends Migration
}
}
}
+;
diff --git a/database/migrations/2016_06_16_000002_create_main_tables.php b/database/migrations/2016_06_16_000002_create_main_tables.php
index 6f6fd9430a..99b11133d5 100644
--- a/database/migrations/2016_06_16_000002_create_main_tables.php
+++ b/database/migrations/2016_06_16_000002_create_main_tables.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class CreateMainTables extends Migration
+return new class extends Migration
{
private const TABLE_ALREADY_EXISTS = 'If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.';
private const TABLE_ERROR = 'Could not create table "%s": %s';
@@ -632,3 +632,4 @@ class CreateMainTables extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2016_08_25_091522_changes_for_3101.php b/database/migrations/2016_08_25_091522_changes_for_3101.php
index ce78bf0dfe..22e0900faf 100644
--- a/database/migrations/2016_08_25_091522_changes_for_3101.php
+++ b/database/migrations/2016_08_25_091522_changes_for_3101.php
@@ -28,7 +28,7 @@ use Illuminate\Database\Migrations\Migration;
*
* @codeCoverageIgnore
*/
-class ChangesFor3101 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -42,3 +42,4 @@ class ChangesFor3101 extends Migration
*/
public function up(): void {}
}
+ ;
diff --git a/database/migrations/2016_09_12_121359_fix_nullables.php b/database/migrations/2016_09_12_121359_fix_nullables.php
index 2636459641..ee21bdb6e4 100644
--- a/database/migrations/2016_09_12_121359_fix_nullables.php
+++ b/database/migrations/2016_09_12_121359_fix_nullables.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class FixNullables extends Migration
+return new class extends Migration
{
private const COLUMN_ALREADY_EXISTS = 'If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.';
private const TABLE_UPDATE_ERROR = 'Could not update table "%s": %s';
@@ -71,3 +71,4 @@ class FixNullables extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2016_10_09_150037_expand_transactions_table.php b/database/migrations/2016_10_09_150037_expand_transactions_table.php
index ed5b86002d..f05aafaac5 100644
--- a/database/migrations/2016_10_09_150037_expand_transactions_table.php
+++ b/database/migrations/2016_10_09_150037_expand_transactions_table.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ExpandTransactionsTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -69,3 +69,4 @@ class ExpandTransactionsTable extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2016_10_22_075804_changes_for_v410.php b/database/migrations/2016_10_22_075804_changes_for_v410.php
index 0204d8027d..d4da66409a 100644
--- a/database/migrations/2016_10_22_075804_changes_for_v410.php
+++ b/database/migrations/2016_10_22_075804_changes_for_v410.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV410 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -68,3 +68,4 @@ class ChangesForV410 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2016_11_24_210552_changes_for_v420.php b/database/migrations/2016_11_24_210552_changes_for_v420.php
index 8f147aa800..7b6ea34afe 100644
--- a/database/migrations/2016_11_24_210552_changes_for_v420.php
+++ b/database/migrations/2016_11_24_210552_changes_for_v420.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV420 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -69,3 +69,4 @@ class ChangesForV420 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php
index f2c69540be..3cb0c8ecb5 100644
--- a/database/migrations/2016_12_22_150431_changes_for_v430.php
+++ b/database/migrations/2016_12_22_150431_changes_for_v430.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV430 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -72,3 +72,4 @@ class ChangesForV430 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2016_12_28_203205_changes_for_v431.php b/database/migrations/2016_12_28_203205_changes_for_v431.php
index 8cf509fb52..69d6df5acf 100644
--- a/database/migrations/2016_12_28_203205_changes_for_v431.php
+++ b/database/migrations/2016_12_28_203205_changes_for_v431.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV431 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -161,3 +161,4 @@ class ChangesForV431 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2017_04_13_163623_changes_for_v440.php b/database/migrations/2017_04_13_163623_changes_for_v440.php
index 8d5c02e936..83d535d7cb 100644
--- a/database/migrations/2017_04_13_163623_changes_for_v440.php
+++ b/database/migrations/2017_04_13_163623_changes_for_v440.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV440 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -102,3 +102,4 @@ class ChangesForV440 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2017_06_02_105232_changes_for_v450.php b/database/migrations/2017_06_02_105232_changes_for_v450.php
index 9f83911efc..a570f9a22d 100644
--- a/database/migrations/2017_06_02_105232_changes_for_v450.php
+++ b/database/migrations/2017_06_02_105232_changes_for_v450.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV450 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -106,3 +106,4 @@ class ChangesForV450 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2017_08_20_062014_changes_for_v470.php b/database/migrations/2017_08_20_062014_changes_for_v470.php
index 797a4d848d..7b8b789e6a 100644
--- a/database/migrations/2017_08_20_062014_changes_for_v470.php
+++ b/database/migrations/2017_08_20_062014_changes_for_v470.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV470 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -95,3 +95,4 @@ class ChangesForV470 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2017_11_04_170844_changes_for_v470a.php b/database/migrations/2017_11_04_170844_changes_for_v470a.php
index 438c387ea9..ca27844f3c 100644
--- a/database/migrations/2017_11_04_170844_changes_for_v470a.php
+++ b/database/migrations/2017_11_04_170844_changes_for_v470a.php
@@ -31,7 +31,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV470a extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -69,3 +69,4 @@ class ChangesForV470a extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php b/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php
index 9fd7aab590..13d4a53854 100644
--- a/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php
+++ b/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class CreateOauthAuthCodesTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -68,3 +68,4 @@ class CreateOauthAuthCodesTable extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php
index c3604b318d..bccd0a5f68 100644
--- a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php
+++ b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class CreateOauthAccessTokensTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -70,3 +70,4 @@ class CreateOauthAccessTokensTable extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php
index bc3f7d1d48..4bac7ed68a 100644
--- a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php
+++ b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class CreateOauthRefreshTokensTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -66,3 +66,4 @@ class CreateOauthRefreshTokensTable extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php
index 43ffc54a5f..60223ee31c 100644
--- a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php
+++ b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class CreateOauthClientsTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -71,3 +71,4 @@ class CreateOauthClientsTable extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php
index 32d792d517..651e333c6f 100644
--- a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php
+++ b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class CreateOauthPersonalAccessClientsTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -65,3 +65,4 @@ class CreateOauthPersonalAccessClientsTable extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_03_19_141348_changes_for_v472.php b/database/migrations/2018_03_19_141348_changes_for_v472.php
index 5b378d3e9c..b8a6281cf0 100644
--- a/database/migrations/2018_03_19_141348_changes_for_v472.php
+++ b/database/migrations/2018_03_19_141348_changes_for_v472.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV472 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -92,3 +92,4 @@ class ChangesForV472 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_04_07_210913_changes_for_v473.php b/database/migrations/2018_04_07_210913_changes_for_v473.php
index 7d7f3bad2d..f841bb44d5 100644
--- a/database/migrations/2018_04_07_210913_changes_for_v473.php
+++ b/database/migrations/2018_04_07_210913_changes_for_v473.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV473 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -96,3 +96,4 @@ class ChangesForV473 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_04_29_174524_changes_for_v474.php b/database/migrations/2018_04_29_174524_changes_for_v474.php
index a3415a224d..3056e5cfe2 100644
--- a/database/migrations/2018_04_29_174524_changes_for_v474.php
+++ b/database/migrations/2018_04_29_174524_changes_for_v474.php
@@ -29,7 +29,7 @@ use Illuminate\Database\Migrations\Migration;
*
* @codeCoverageIgnore
*/
-class ChangesForV474 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -43,3 +43,4 @@ class ChangesForV474 extends Migration
*/
public function up(): void {}
}
+ ;
diff --git a/database/migrations/2018_06_08_200526_changes_for_v475.php b/database/migrations/2018_06_08_200526_changes_for_v475.php
index 6113170cc0..41f42870e6 100644
--- a/database/migrations/2018_06_08_200526_changes_for_v475.php
+++ b/database/migrations/2018_06_08_200526_changes_for_v475.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV475 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -179,3 +179,4 @@ class ChangesForV475 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_09_05_195147_changes_for_v477.php b/database/migrations/2018_09_05_195147_changes_for_v477.php
index d98f91ba18..6a55308ee4 100644
--- a/database/migrations/2018_09_05_195147_changes_for_v477.php
+++ b/database/migrations/2018_09_05_195147_changes_for_v477.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV477 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -76,3 +76,4 @@ class ChangesForV477 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2018_11_06_172532_changes_for_v479.php b/database/migrations/2018_11_06_172532_changes_for_v479.php
index d381354989..89f59ba594 100644
--- a/database/migrations/2018_11_06_172532_changes_for_v479.php
+++ b/database/migrations/2018_11_06_172532_changes_for_v479.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV479 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -70,3 +70,4 @@ class ChangesForV479 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2019_01_28_193833_changes_for_v4710.php b/database/migrations/2019_01_28_193833_changes_for_v4710.php
index 71b83d38ee..214d151f84 100644
--- a/database/migrations/2019_01_28_193833_changes_for_v4710.php
+++ b/database/migrations/2019_01_28_193833_changes_for_v4710.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV4710 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -91,3 +91,4 @@ class ChangesForV4710 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2019_02_05_055516_changes_for_v4711.php b/database/migrations/2019_02_05_055516_changes_for_v4711.php
index e42ad0c4ca..b57325ae21 100644
--- a/database/migrations/2019_02_05_055516_changes_for_v4711.php
+++ b/database/migrations/2019_02_05_055516_changes_for_v4711.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV4711 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -73,3 +73,4 @@ class ChangesForV4711 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2019_02_11_170529_changes_for_v4712.php b/database/migrations/2019_02_11_170529_changes_for_v4712.php
index f0773c5c82..b995b096aa 100644
--- a/database/migrations/2019_02_11_170529_changes_for_v4712.php
+++ b/database/migrations/2019_02_11_170529_changes_for_v4712.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV4712 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -64,3 +64,4 @@ class ChangesForV4712 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2019_03_11_223700_fix_ldap_configuration.php b/database/migrations/2019_03_11_223700_fix_ldap_configuration.php
index 780b75b075..eb54a6d37e 100644
--- a/database/migrations/2019_03_11_223700_fix_ldap_configuration.php
+++ b/database/migrations/2019_03_11_223700_fix_ldap_configuration.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class FixLdapConfiguration extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -74,3 +74,4 @@ class FixLdapConfiguration extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2019_03_22_183214_changes_for_v480.php b/database/migrations/2019_03_22_183214_changes_for_v480.php
index b9335af137..fed86b91af 100644
--- a/database/migrations/2019_03_22_183214_changes_for_v480.php
+++ b/database/migrations/2019_03_22_183214_changes_for_v480.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV480 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -161,3 +161,4 @@ class ChangesForV480 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2019_12_28_191351_make_locations_table.php b/database/migrations/2019_12_28_191351_make_locations_table.php
index 902391d40e..da0569ae8a 100644
--- a/database/migrations/2019_12_28_191351_make_locations_table.php
+++ b/database/migrations/2019_12_28_191351_make_locations_table.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class MakeLocationsTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -72,3 +72,4 @@ class MakeLocationsTable extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2020_03_13_201950_changes_for_v520.php b/database/migrations/2020_03_13_201950_changes_for_v520.php
index 52bae22a56..e9ce25398d 100644
--- a/database/migrations/2020_03_13_201950_changes_for_v520.php
+++ b/database/migrations/2020_03_13_201950_changes_for_v520.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV520 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -74,3 +74,4 @@ class ChangesForV520 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2020_06_07_063612_changes_for_v530.php b/database/migrations/2020_06_07_063612_changes_for_v530.php
index 8aed5ae077..4f608de67f 100644
--- a/database/migrations/2020_06_07_063612_changes_for_v530.php
+++ b/database/migrations/2020_06_07_063612_changes_for_v530.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV530 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -85,3 +85,4 @@ class ChangesForV530 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2020_06_30_202620_changes_for_v530a.php b/database/migrations/2020_06_30_202620_changes_for_v530a.php
index 6e8989566e..c0033497c7 100644
--- a/database/migrations/2020_06_30_202620_changes_for_v530a.php
+++ b/database/migrations/2020_06_30_202620_changes_for_v530a.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV530a extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -70,3 +70,4 @@ class ChangesForV530a extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2020_07_24_162820_changes_for_v540.php b/database/migrations/2020_07_24_162820_changes_for_v540.php
index b91b74924c..c1d72a47ea 100644
--- a/database/migrations/2020_07_24_162820_changes_for_v540.php
+++ b/database/migrations/2020_07_24_162820_changes_for_v540.php
@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Schema;
*
* @codeCoverageIgnore
*/
-class ChangesForV540 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -135,3 +135,4 @@ class ChangesForV540 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2020_11_12_070604_changes_for_v550.php b/database/migrations/2020_11_12_070604_changes_for_v550.php
index a6c80d4c56..cef03001ec 100644
--- a/database/migrations/2020_11_12_070604_changes_for_v550.php
+++ b/database/migrations/2020_11_12_070604_changes_for_v550.php
@@ -30,7 +30,7 @@ use Illuminate\Support\Facades\Schema;
/**
* Class ChangesForV550
*/
-class ChangesForV550 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -266,3 +266,4 @@ class ChangesForV550 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2021_03_12_061213_changes_for_v550b2.php b/database/migrations/2021_03_12_061213_changes_for_v550b2.php
index 5748ff9c66..47f0998294 100644
--- a/database/migrations/2021_03_12_061213_changes_for_v550b2.php
+++ b/database/migrations/2021_03_12_061213_changes_for_v550b2.php
@@ -30,7 +30,7 @@ use Illuminate\Support\Facades\Schema;
/**
* Class ChangesForV550b2
*/
-class ChangesForV550b2 extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -77,3 +77,4 @@ class ChangesForV550b2 extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php b/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php
index 99db4e147d..6fb4fdb6b9 100644
--- a/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php
+++ b/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddLdapColumnsToUsersTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -65,3 +65,4 @@ class AddLdapColumnsToUsersTable extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2021_05_13_053836_extend_currency_info.php b/database/migrations/2021_05_13_053836_extend_currency_info.php
index 1836e844b4..c65bad331c 100644
--- a/database/migrations/2021_05_13_053836_extend_currency_info.php
+++ b/database/migrations/2021_05_13_053836_extend_currency_info.php
@@ -30,7 +30,7 @@ use Illuminate\Support\Facades\Schema;
/**
* Class ExtendCurrencyInfo
*/
-class ExtendCurrencyInfo extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -55,3 +55,4 @@ class ExtendCurrencyInfo extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2021_07_05_193044_drop_tele_table.php b/database/migrations/2021_07_05_193044_drop_tele_table.php
index 115ba6258f..1a36b35c8a 100644
--- a/database/migrations/2021_07_05_193044_drop_tele_table.php
+++ b/database/migrations/2021_07_05_193044_drop_tele_table.php
@@ -28,7 +28,7 @@ use Illuminate\Support\Facades\Schema;
/**
* Class DropTeleTable
*/
-class DropTeleTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -48,3 +48,4 @@ class DropTeleTable extends Migration
Schema::dropIfExists('telemetry');
}
}
+ ;
diff --git a/database/migrations/2021_08_28_073733_user_groups.php b/database/migrations/2021_08_28_073733_user_groups.php
index 3f8ff4d301..54f4742b23 100644
--- a/database/migrations/2021_08_28_073733_user_groups.php
+++ b/database/migrations/2021_08_28_073733_user_groups.php
@@ -30,7 +30,7 @@ use Illuminate\Support\Facades\Schema;
/**
* Class UserGroups
*/
-class UserGroups extends Migration
+return new class extends Migration
{
private array $tables = [
'accounts',
@@ -199,3 +199,4 @@ class UserGroups extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2021_12_27_000001_create_local_personal_access_tokens_table.php b/database/migrations/2021_12_27_000001_create_local_personal_access_tokens_table.php
index 935f49a861..815ce40583 100644
--- a/database/migrations/2021_12_27_000001_create_local_personal_access_tokens_table.php
+++ b/database/migrations/2021_12_27_000001_create_local_personal_access_tokens_table.php
@@ -30,7 +30,7 @@ use Illuminate\Support\Facades\Schema;
/**
* Class CreateLocalPersonalAccessTokensTable
*/
-class CreateLocalPersonalAccessTokensTable extends Migration
+return new class extends Migration
{
/**
* Reverse the migrations.
@@ -67,3 +67,4 @@ class CreateLocalPersonalAccessTokensTable extends Migration
}
}
}
+ ;
diff --git a/database/migrations/2022_08_21_104626_add_user_groups.php b/database/migrations/2022_08_21_104626_add_user_groups.php
index a861181562..d223f6d592 100644
--- a/database/migrations/2022_08_21_104626_add_user_groups.php
+++ b/database/migrations/2022_08_21_104626_add_user_groups.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
/**
* Reverse the migrations.
*/
diff --git a/database/migrations/2022_09_18_123911_create_notifications_table.php b/database/migrations/2022_09_18_123911_create_notifications_table.php
index 2664ca770c..8095ca0873 100644
--- a/database/migrations/2022_09_18_123911_create_notifications_table.php
+++ b/database/migrations/2022_09_18_123911_create_notifications_table.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
/**
* Reverse the migrations.
*/
diff --git a/database/migrations/2022_10_01_074908_invited_users.php b/database/migrations/2022_10_01_074908_invited_users.php
index d7f6eb50e0..ac42a74538 100644
--- a/database/migrations/2022_10_01_074908_invited_users.php
+++ b/database/migrations/2022_10_01_074908_invited_users.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
/**
* Reverse the migrations.
*/
diff --git a/database/migrations/2022_10_01_210238_audit_log_entries.php b/database/migrations/2022_10_01_210238_audit_log_entries.php
index f5110acab0..23f57b68f7 100644
--- a/database/migrations/2022_10_01_210238_audit_log_entries.php
+++ b/database/migrations/2022_10_01_210238_audit_log_entries.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
/**
* Reverse the migrations.
*/
diff --git a/database/migrations/2023_08_11_192521_upgrade_og_table.php b/database/migrations/2023_08_11_192521_upgrade_og_table.php
index 66e4375094..b42f62f659 100644
--- a/database/migrations/2023_08_11_192521_upgrade_og_table.php
+++ b/database/migrations/2023_08_11_192521_upgrade_og_table.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
/**
* Reverse the migrations.
*/
diff --git a/database/migrations/2023_10_21_113213_add_currency_pivot_tables.php b/database/migrations/2023_10_21_113213_add_currency_pivot_tables.php
index a5ab00e0cd..4fb72f580d 100644
--- a/database/migrations/2023_10_21_113213_add_currency_pivot_tables.php
+++ b/database/migrations/2023_10_21_113213_add_currency_pivot_tables.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
/**
* Reverse the migrations.
*/
diff --git a/database/migrations/2024_03_03_174645_add_indices.php b/database/migrations/2024_03_03_174645_add_indices.php
index 2025a0a2be..2845688d60 100644
--- a/database/migrations/2024_03_03_174645_add_indices.php
+++ b/database/migrations/2024_03_03_174645_add_indices.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
private const string QUERY_ERROR = 'Could not execute query (table "%s", field "%s"): %s';
private const string EXPL = 'If the index already exists (see error), or if MySQL can\'t do it, this is not an problem. Otherwise, please open a GitHub discussion.';
diff --git a/database/migrations/2024_04_01_174351_expand_preferences_table.php b/database/migrations/2024_04_01_174351_expand_preferences_table.php
index 0022db6abd..466cd2b948 100644
--- a/database/migrations/2024_04_01_174351_expand_preferences_table.php
+++ b/database/migrations/2024_04_01_174351_expand_preferences_table.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
/**
* Reverse the migrations.
*/
diff --git a/database/migrations/2024_05_12_060551_create_account_balance_table.php b/database/migrations/2024_05_12_060551_create_account_balance_table.php
index f11a3f3eff..9b578a74f9 100644
--- a/database/migrations/2024_05_12_060551_create_account_balance_table.php
+++ b/database/migrations/2024_05_12_060551_create_account_balance_table.php
@@ -26,7 +26,7 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
/**
* Reverse the migrations.
*/
diff --git a/database/migrations/2024_07_28_145631_add_running_balance.php b/database/migrations/2024_07_28_145631_add_running_balance.php
index b04ee78bda..f2de29ff44 100644
--- a/database/migrations/2024_07_28_145631_add_running_balance.php
+++ b/database/migrations/2024_07_28_145631_add_running_balance.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
/**
* Reverse the migrations.
*/
diff --git a/database/migrations/2024_11_05_062108_add_date_tz_columns.php b/database/migrations/2024_11_05_062108_add_date_tz_columns.php
index 6bb3726641..e10952b277 100644
--- a/database/migrations/2024_11_05_062108_add_date_tz_columns.php
+++ b/database/migrations/2024_11_05_062108_add_date_tz_columns.php
@@ -27,7 +27,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
private array $tables;
public function __construct()
diff --git a/database/migrations/2024_11_30_075826_multi_piggy.php b/database/migrations/2024_11_30_075826_multi_piggy.php
index 1a0ed7ed22..54258b6e9f 100644
--- a/database/migrations/2024_11_30_075826_multi_piggy.php
+++ b/database/migrations/2024_11_30_075826_multi_piggy.php
@@ -28,7 +28,7 @@ use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
protected static function hasForeign(string $table, string $column): bool
{
$foreignKeysDefinitions = Schema::getForeignKeys($table);
diff --git a/database/migrations/2024_12_19_061003_add_native_amount_column.php b/database/migrations/2024_12_19_061003_add_native_amount_column.php
index 4776b05fff..7822ea1544 100644
--- a/database/migrations/2024_12_19_061003_add_native_amount_column.php
+++ b/database/migrations/2024_12_19_061003_add_native_amount_column.php
@@ -1,5 +1,4 @@
['native_virtual_balance'], // works.
diff --git a/database/migrations/2025_07_10_065736_rename_tag_mode.php b/database/migrations/2025_07_10_065736_rename_tag_mode.php
index d001bd4d4b..7fb0d3f40e 100644
--- a/database/migrations/2025_07_10_065736_rename_tag_mode.php
+++ b/database/migrations/2025_07_10_065736_rename_tag_mode.php
@@ -1,5 +1,5 @@
value)->first()) {
try {
UserRole::create(['title' => $role->value]);
- } catch (PDOException $e) {
- // @ignoreException
+ } catch (PDOException) {
+ Log::debug(sprintf('User role with title "%s" already exists and that is OK', $role->value));
}
}
}
diff --git a/mago.toml b/mago.toml
index 598898a063..d7e3d42815 100644
--- a/mago.toml
+++ b/mago.toml
@@ -1,6 +1,6 @@
# Welcome to Mago!
# For full documentation, see https://mago.carthage.software/tools/overview
-php-version = "8.4.0"
+php-version = "8.5.0"
[source]
workspace = "."
@@ -26,8 +26,35 @@ excludes = ["app/Providers/AppServiceProvider.php"] # Additionally excluded fro
[linter.rules]
ambiguous-function-call = { enabled = false }
literal-named-argument = { enabled = false }
-halstead = { effort-threshold = 7000 }
+halstead = { effort-threshold = 7000, enabled = false }
prefer-early-continue = { enabled = false }
+cyclomatic-complexity = { enabled = false }
+middleware-in-routes = { enabled = false }
+too-many-methods = { enabled = false }
+kan-defect = { enabled = false }
+no-request-all = { enabled = false }
+tagged-todo = { enabled = false }
+too-many-properties = { enabled = false }
+prefer-view-array = { enabled = false }
+assertion-style = { enabled = false }
+no-boolean-flag-parameter = { enabled = false }
+prefer-static-closure = { enabled = false }
+no-literal-password = { enabled = false }
+too-many-enum-cases = { enabled = false }
+no-assign-in-condition = { enabled = false }
+tagged-fixme = { enabled = false }
+no-empty-catch-clause = { enabled = false }
+excessive-parameter-list = { enabled = false }
+no-sprintf-concat = { enabled = false }
+no-redundant-use ={ enabled = false }
+no-redundant-math={ enabled = false }
+prefer-first-class-callable={ enabled = false }
+no-redundant-method-override={ enabled = false }
+no-empty-comment={ enabled = false }
+no-insecure-comparison={ enabled = false }
+prefer-arrow-function = { enabled = false }
+
+
[analyzer]
find-unused-definitions = true