From 38691d6fdfbd505619e25f7fb325278e4b686e7a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 9 Nov 2025 09:06:11 +0100 Subject: [PATCH] Fix code quality with rector [skip ci] --- .../Autocomplete/AccountController.php | 5 +++-- .../Autocomplete/BillController.php | 5 +++-- .../Autocomplete/BudgetController.php | 5 +++-- .../Autocomplete/CategoryController.php | 5 +++-- .../Autocomplete/CurrencyController.php | 3 ++- .../Autocomplete/ObjectGroupController.php | 3 ++- .../Autocomplete/PiggyBankController.php | 3 ++- .../Autocomplete/RecurrenceController.php | 3 ++- .../Autocomplete/RuleController.php | 3 ++- .../Autocomplete/RuleGroupController.php | 3 ++- .../Autocomplete/TagController.php | 3 ++- .../Autocomplete/TransactionController.php | 3 ++- .../TransactionTypeController.php | 3 ++- .../Controllers/Chart/AccountController.php | 3 ++- .../Controllers/Chart/BalanceController.php | 3 ++- .../V1/Controllers/Chart/BudgetController.php | 11 +++++----- .../Controllers/Chart/CategoryController.php | 5 +++-- app/Api/V1/Controllers/Controller.php | 9 ++++---- .../Data/Bulk/TransactionController.php | 3 ++- .../V1/Controllers/Data/DestroyController.php | 5 +++-- .../Data/Export/ExportController.php | 3 ++- .../V1/Controllers/Data/PurgeController.php | 3 ++- .../DestroyController.php | 3 ++- .../CurrencyExchangeRate/IndexController.php | 3 ++- .../CurrencyExchangeRate/ShowController.php | 3 ++- .../CurrencyExchangeRate/StoreController.php | 3 ++- .../CurrencyExchangeRate/UpdateController.php | 3 ++- app/User.php | 21 ++++++++----------- 28 files changed, 76 insertions(+), 52 deletions(-) diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php index 01502a60e9..1dc73a3c76 100644 --- a/app/Api/V1/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\AccountTypeEnum; @@ -60,7 +61,7 @@ class AccountController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(AccountRepositoryInterface::class); $this->repository->setUser($this->user); @@ -138,7 +139,7 @@ class AccountController extends Controller // custom order. usort( $return, - static function (array $left, array $right) { + static function (array $left, array $right): int { $order = [AccountTypeEnum::ASSET->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::EXPENSE->value]; $posA = (int)array_search($left['type'], $order, true); $posB = (int)array_search($right['type'], $order, true); diff --git a/app/Api/V1/Controllers/Autocomplete/BillController.php b/app/Api/V1/Controllers/Autocomplete/BillController.php index 4c0da6fc4c..edc428d319 100644 --- a/app/Api/V1/Controllers/Autocomplete/BillController.php +++ b/app/Api/V1/Controllers/Autocomplete/BillController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -46,7 +47,7 @@ class BillController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(BillRepositoryInterface::class); $this->repository->setUser($this->user); @@ -65,7 +66,7 @@ class BillController extends Controller { $result = $this->repository->searchBill($request->attributes->get('query'), $request->attributes->get('limit')); $filtered = $result->map( - static fn (Bill $item) => [ + static fn (Bill $item): array => [ 'id' => (string) $item->id, 'name' => $item->name, 'active' => $item->active, diff --git a/app/Api/V1/Controllers/Autocomplete/BudgetController.php b/app/Api/V1/Controllers/Autocomplete/BudgetController.php index 4a096bff1e..c38b268494 100644 --- a/app/Api/V1/Controllers/Autocomplete/BudgetController.php +++ b/app/Api/V1/Controllers/Autocomplete/BudgetController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -46,7 +47,7 @@ class BudgetController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(BudgetRepositoryInterface::class); $this->repository->setUser($this->user); @@ -65,7 +66,7 @@ class BudgetController extends Controller { $result = $this->repository->searchBudget($request->attributes->get('query'), $request->attributes->get('limit')); $filtered = $result->map( - static fn (Budget $item) => [ + static fn (Budget $item): array => [ 'id' => (string) $item->id, 'name' => $item->name, 'active' => $item->active, diff --git a/app/Api/V1/Controllers/Autocomplete/CategoryController.php b/app/Api/V1/Controllers/Autocomplete/CategoryController.php index 34a963b5ea..09ef038b21 100644 --- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php +++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -46,7 +47,7 @@ class CategoryController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(CategoryRepositoryInterface::class); $this->repository->setUser($this->user); @@ -65,7 +66,7 @@ class CategoryController extends Controller { $result = $this->repository->searchCategory($request->attributes->get('query'), $request->attributes->get('limit')); $filtered = $result->map( - static fn (Category $item) => [ + static fn (Category $item): array => [ 'id' => (string) $item->id, 'name' => $item->name, ] diff --git a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php index 1528e17c18..3259306e79 100644 --- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php +++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use Deprecated; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; @@ -48,7 +49,7 @@ class CurrencyController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(CurrencyRepositoryInterface::class); $this->repository->setUser($this->user); diff --git a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php index 38a2ce56be..c9de397ed8 100644 --- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php +++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -46,7 +47,7 @@ class ObjectGroupController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(ObjectGroupRepositoryInterface::class); $this->repository->setUser($this->user); diff --git a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php index f31a990cf0..327c92c8ae 100644 --- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php +++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -50,7 +51,7 @@ class PiggyBankController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->piggyRepository = app(PiggyBankRepositoryInterface::class); $this->accountRepository = app(AccountRepositoryInterface::class); diff --git a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php index e757d098c1..2882b51a1f 100644 --- a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php +++ b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -46,7 +47,7 @@ class RecurrenceController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(RecurringRepositoryInterface::class); $this->repository->setUser($this->user); diff --git a/app/Api/V1/Controllers/Autocomplete/RuleController.php b/app/Api/V1/Controllers/Autocomplete/RuleController.php index 1ff0271607..79514e9a80 100644 --- a/app/Api/V1/Controllers/Autocomplete/RuleController.php +++ b/app/Api/V1/Controllers/Autocomplete/RuleController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -46,7 +47,7 @@ class RuleController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(RuleRepositoryInterface::class); $this->repository->setUser($this->user); diff --git a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php index 70c66be5ee..b2cee766c9 100644 --- a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php +++ b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -46,7 +47,7 @@ class RuleGroupController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(RuleGroupRepositoryInterface::class); $this->repository->setUser($this->user); diff --git a/app/Api/V1/Controllers/Autocomplete/TagController.php b/app/Api/V1/Controllers/Autocomplete/TagController.php index d797931319..83305b5e32 100644 --- a/app/Api/V1/Controllers/Autocomplete/TagController.php +++ b/app/Api/V1/Controllers/Autocomplete/TagController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -46,7 +47,7 @@ class TagController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(TagRepositoryInterface::class); $this->repository->setUser($this->user); diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.php index cf8302fdf2..91d6956cc7 100644 --- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php +++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteTransactionApiRequest; @@ -51,7 +52,7 @@ class TransactionController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(JournalRepositoryInterface::class); $this->groupRepository = app(TransactionGroupRepositoryInterface::class); diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php index bdfad0d9d9..535d094b4d 100644 --- a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php +++ b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Autocomplete; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest; use FireflyIII\Enums\UserRoleEnum; @@ -46,7 +47,7 @@ class TransactionTypeController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(TransactionTypeRepositoryInterface::class); diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php index f321965777..c097ec0372 100644 --- a/app/Api/V1/Controllers/Chart/AccountController.php +++ b/app/Api/V1/Controllers/Chart/AccountController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Chart; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Chart\ChartRequest; use FireflyIII\Enums\UserRoleEnum; @@ -59,7 +60,7 @@ class AccountController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->repository = app(AccountRepositoryInterface::class); $this->validateUserGroup($request); $this->repository->setUserGroup($this->userGroup); diff --git a/app/Api/V1/Controllers/Chart/BalanceController.php b/app/Api/V1/Controllers/Chart/BalanceController.php index cd3d967dc6..1014c15cd2 100644 --- a/app/Api/V1/Controllers/Chart/BalanceController.php +++ b/app/Api/V1/Controllers/Chart/BalanceController.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Chart; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Chart\ChartRequest; use FireflyIII\Enums\TransactionTypeEnum; @@ -56,7 +57,7 @@ class BalanceController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(AccountRepositoryInterface::class); $this->collector = app(GroupCollectorInterface::class); diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.php index 090b90f65a..c63d7d32fa 100644 --- a/app/Api/V1/Controllers/Chart/BudgetController.php +++ b/app/Api/V1/Controllers/Chart/BudgetController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Chart; +use Illuminate\Http\Request; use Carbon\Carbon; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\DateRangeRequest; @@ -61,7 +62,7 @@ class BudgetController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(BudgetRepositoryInterface::class); $this->blRepository = app(BudgetLimitRepositoryInterface::class); @@ -140,14 +141,14 @@ class BudgetController extends Controller } // convert data if necessary. - if (true === $this->convertToPrimary && $currencyId !== $this->primaryCurrency->id) { + if ($this->convertToPrimary && $currencyId !== $this->primaryCurrency->id) { $currencies[$currencyId] ??= Amount::getTransactionCurrencyById($currencyId); $row['pc_budgeted'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['budgeted']); $row['pc_spent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['spent']); $row['pc_left'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['left']); $row['pc_overspent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['overspent']); } - if (true === $this->convertToPrimary && $currencyId === $this->primaryCurrency->id) { + if ($this->convertToPrimary && $currencyId === $this->primaryCurrency->id) { $row['pc_budgeted'] = $row['budgeted']; $row['pc_spent'] = $row['spent']; $row['pc_left'] = $row['left']; @@ -265,7 +266,7 @@ class BudgetController extends Controller /** @var BudgetLimit $current */ foreach ($limits as $current) { - if (true === $this->convertToPrimary) { + if ($this->convertToPrimary) { if ($current->transaction_currency_id === $this->primaryCurrency->id) { // simply add it. $amount = bcadd($amount, (string)$current->amount); @@ -283,7 +284,7 @@ class BudgetController extends Controller $limit = $current; } } - if (null !== $limit && true === $this->convertToPrimary) { + if (null !== $limit && $this->convertToPrimary) { // convert and add all amounts. $limit->amount = app('steam')->positive($amount); Log::debug(sprintf('Final amount in limit with converted amount %s', $limit->amount)); diff --git a/app/Api/V1/Controllers/Chart/CategoryController.php b/app/Api/V1/Controllers/Chart/CategoryController.php index a85fc89fa3..31df558fc6 100644 --- a/app/Api/V1/Controllers/Chart/CategoryController.php +++ b/app/Api/V1/Controllers/Chart/CategoryController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Chart; +use Illuminate\Http\Request; use Carbon\Carbon; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\DateRangeRequest; @@ -58,7 +59,7 @@ class CategoryController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->accountRepos = app(AccountRepositoryInterface::class); $this->currencyRepos = app(CurrencyRepositoryInterface::class); @@ -181,7 +182,7 @@ class CategoryController extends Controller $return = array_values($return); // order by amount - usort($return, static fn (array $a, array $b) => ((float)$a['entries']['spent'] + (float)$a['entries']['earned']) < ((float)$b['entries']['spent'] + (float)$b['entries']['earned']) ? 1 : -1); + usort($return, static fn (array $a, array $b): int => ((float)$a['entries']['spent'] + (float)$a['entries']['earned']) < ((float)$b['entries']['spent'] + (float)$b['entries']['earned']) ? 1 : -1); return response()->json($this->clean($return)); } diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index c9169673b5..8c6cff0d16 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers; +use Deprecated; use Carbon\Carbon; use Carbon\Exceptions\InvalidFormatException; use FireflyIII\Exceptions\BadHttpHeaderException; @@ -100,10 +101,10 @@ abstract class Controller extends BaseController ); } - /** - * @deprecated use Request classes - * Method to grab all parameters from the URL - */ + #[Deprecated(message: <<<'TXT' + use Request classes + Method to grab all parameters from the URL + TXT)] private function getParameters(): ParameterBag { $bag = new ParameterBag(); diff --git a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php index 7f00225c70..d896f60fe8 100644 --- a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php +++ b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Data\Bulk; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Data\Bulk\TransactionRequest; use FireflyIII\Enums\UserRoleEnum; @@ -51,7 +52,7 @@ class TransactionController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->repository = app(AccountRepositoryInterface::class); $this->repository->setUserGroup($this->userGroup); diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.php index 86180cf44c..85ac99ae94 100644 --- a/app/Api/V1/Controllers/Data/DestroyController.php +++ b/app/Api/V1/Controllers/Data/DestroyController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Data; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Data\DestroyRequest; use FireflyIII\Enums\AccountTypeEnum; @@ -63,7 +64,7 @@ class DestroyController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); return $next($request); @@ -185,7 +186,7 @@ class DestroyController extends Controller /** @var Account $account */ foreach ($collection as $account) { $count = $account->transactions()->count(); - if (true === $this->unused && 0 === $count) { + if ($this->unused && 0 === $count) { Log::info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name)); Log::channel('audit')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name)); $service->destroy($account, null); diff --git a/app/Api/V1/Controllers/Data/Export/ExportController.php b/app/Api/V1/Controllers/Data/Export/ExportController.php index 7e78ca920e..0f055c4428 100644 --- a/app/Api/V1/Controllers/Data/Export/ExportController.php +++ b/app/Api/V1/Controllers/Data/Export/ExportController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Data\Export; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest; use FireflyIII\Enums\UserRoleEnum; @@ -49,7 +50,7 @@ class ExportController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); $this->exporter = app(ExportDataGenerator::class); $this->exporter->setUserGroup($this->userGroup); diff --git a/app/Api/V1/Controllers/Data/PurgeController.php b/app/Api/V1/Controllers/Data/PurgeController.php index cea88fa0e6..700b0da352 100644 --- a/app/Api/V1/Controllers/Data/PurgeController.php +++ b/app/Api/V1/Controllers/Data/PurgeController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Data; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Models\Account; @@ -51,7 +52,7 @@ class PurgeController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->validateUserGroup($request); return $next($request); diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php index 27ce2e6330..807ff96f31 100644 --- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php +++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate; +use Illuminate\Http\Request; use Carbon\Carbon; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\DestroyRequest; @@ -47,7 +48,7 @@ class DestroyController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->repository = app(ExchangeRateRepositoryInterface::class); $this->repository->setUserGroup($this->validateUserGroup($request)); diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php index cebd3a8277..f5bdd92d87 100644 --- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php +++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate; +use Illuminate\Http\Request; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface; @@ -47,7 +48,7 @@ class IndexController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->repository = app(ExchangeRateRepositoryInterface::class); $this->repository->setUserGroup($this->validateUserGroup($request)); diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php index 22a9756ab7..ac6e94100a 100644 --- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php +++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate; +use Illuminate\Http\Request; use Carbon\Carbon; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Enums\UserRoleEnum; @@ -51,7 +52,7 @@ class ShowController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->repository = app(ExchangeRateRepositoryInterface::class); $this->repository->setUserGroup($this->validateUserGroup($request)); diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php index 45da4ff67e..2b9bd95dbd 100644 --- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php +++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate; +use Illuminate\Http\Request; use Carbon\Carbon; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreByCurrenciesRequest; @@ -52,7 +53,7 @@ class StoreController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->repository = app(ExchangeRateRepositoryInterface::class); $this->repository->setUserGroup($this->validateUserGroup($request)); diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php index 19a34d1b5e..c5fc27d76b 100644 --- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php +++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate; +use Illuminate\Http\Request; use Carbon\Carbon; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\UpdateRequest; @@ -48,7 +49,7 @@ class UpdateController extends Controller { parent::__construct(); $this->middleware( - function ($request, $next) { + function (Request $request, $next) { $this->repository = app(ExchangeRateRepositoryInterface::class); $this->repository->setUserGroup($this->validateUserGroup($request)); diff --git a/app/User.php b/app/User.php index 445ef22f77..82c3f99bf5 100644 --- a/app/User.php +++ b/app/User.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII; +use Illuminate\Support\Facades\Log; use Deprecated; use Exception; use FireflyIII\Enums\UserRoleEnum; @@ -198,11 +199,9 @@ class User extends Authenticatable /** * Get the database column name of the domain. - * - * @return string */ #[Deprecated] - public function getLdapDomainColumn() + public function getLdapDomainColumn(): string { return 'domain'; } @@ -220,11 +219,9 @@ class User extends Authenticatable /** * Get the models LDAP GUID database column name. - * - * @return string */ #[Deprecated] - public function getLdapGuidColumn() + public function getLdapGuidColumn(): string { return 'objectguid'; } @@ -247,12 +244,12 @@ class User extends Authenticatable */ private function hasAnyRoleInGroup(UserGroup $userGroup, array $roles): bool { - app('log')->debug(sprintf('in hasAnyRoleInGroup(%s)', implode(', ', $roles))); + Log::debug(sprintf('in hasAnyRoleInGroup(%s)', implode(', ', $roles))); /** @var Collection $dbRoles */ $dbRoles = UserRole::whereIn('title', $roles)->get(); if (0 === $dbRoles->count()) { - app('log')->error(sprintf('Could not find role(s): %s. Probably migration mishap.', implode(', ', $roles))); + Log::error(sprintf('Could not find role(s): %s. Probably migration mishap.', implode(', ', $roles))); return false; } @@ -261,7 +258,7 @@ class User extends Authenticatable $groupMemberships = $this->groupMemberships()->whereIn('user_role_id', $dbRolesIds)->where('user_group_id', $userGroup->id)->get(); if (0 === $groupMemberships->count()) { - app('log')->error(sprintf( + Log::error(sprintf( 'User #%d "%s" does not have roles %s in user group #%d "%s"', $this->id, $this->email, @@ -273,7 +270,7 @@ class User extends Authenticatable return false; } foreach ($groupMemberships as $membership) { - app('log')->debug(sprintf( + Log::debug(sprintf( 'User #%d "%s" has role "%s" in user group #%d "%s"', $this->id, $this->email, @@ -282,12 +279,12 @@ class User extends Authenticatable $userGroup->title )); if (in_array($membership->userRole->title, $dbRolesTitles, true)) { - app('log')->debug(sprintf('Return true, found role "%s"', $membership->userRole->title)); + Log::debug(sprintf('Return true, found role "%s"', $membership->userRole->title)); return true; } } - app('log')->error(sprintf( + Log::error(sprintf( 'User #%d "%s" does not have roles %s in user group #%d "%s"', $this->id, $this->email,