Merge pull request #10368 from firefly-iii/release-1748230057

🤖 Automatically merge the PR into the develop branch.

.ci/php-cs-fixer/composer.lock

@@ -1349,16 +1349,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
                 "shasum": ""
             },
             "require": {
@@ -1371,7 +1371,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -1396,7 +1396,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -1412,7 +1412,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -1496,16 +1496,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
-                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
                 "shasum": ""
             },
             "require": {
@@ -1519,7 +1519,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -1552,7 +1552,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -1568,7 +1568,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -2305,16 +2305,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
                 "shasum": ""
             },
             "require": {
@@ -2332,7 +2332,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -2368,7 +2368,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -2384,7 +2384,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2025-04-25T09:37:31+00:00"
         },
         {
             "name": "symfony/stopwatch",

.ci/rector.php

@@ -24,10 +24,15 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector;
 
 return RectorConfig::configure()
+    ->withSkip([
+                   ChangeOrIfContinueToMultiContinueRector::class,
+               ])
                    ->withPaths([
 //                                   __DIR__ . '/../app',
+__DIR__ . '/../app/Api',
 __DIR__ . '/../app/Http',
 //                                   __DIR__ . '/../bootstrap',
 //                                   __DIR__ . '/../config',
@@ -43,14 +48,14 @@ __DIR__ . '/../app/Http',
                        privatization: false, // leave false.
                        naming             : false, // leave false
                        instanceOf         : true,
-                       earlyReturn        : false,
+                       earlyReturn        : true,
-                       strictBooleans     : false,
+                       strictBooleans     : true,
-                       carbon             : false,
+                       carbon             : true,
-                       rectorPreset       : false,
+                       rectorPreset       : true,
-                       phpunitCodeQuality : false,
+                       phpunitCodeQuality : true,
-                       doctrineCodeQuality: false,
+                       doctrineCodeQuality: true,
-                       symfonyCodeQuality : false,
+                       symfonyCodeQuality : true,
-                       symfonyConfigs     : false
+                       symfonyConfigs     : true
 
                    )
                    ->withComposerBased(
@@ -61,4 +66,5 @@ __DIR__ . '/../app/Http',
                    ->withTypeCoverageLevel(0)
                    ->withDeadCodeLevel(0)
                    ->withCodeQualityLevel(0)
+
                    ->withImportNames(removeUnusedImports: true);// import statements instead of full classes.

.env.example

@@ -289,7 +289,7 @@ ALLOW_WEBHOOKS=false
 #
 # You can set this variable from a file by appending it with _FILE
 #
-STATIC_CRON_TOKEN=
+STATIC_CRON_TOKEN=PLEASE_REPLACE_WITH_32_CHAR_CODE
 
 # You can fine tune the start-up of a Docker container by editing these environment variables.
 # Use this at your own risk. Disabling certain checks and features may result in lots of inconsistent data.

.github/workflows/sonarcloud.yml

@@ -51,7 +51,10 @@ jobs:
           wget -q https://github.com/firefly-iii/test-fixtures/raw/refs/heads/main/test-database.sqlite -O storage/database/database.sqlite
 
       - name: "Upgrades the database to the latest version"
-        run: php artisan firefly-iii:upgrade-database
+        run: |
+          php artisan firefly-iii:upgrade-database
+          chmod 600 storage/oauth-public.key
+          chmod 600 storage/oauth-private.key
 
       - name: "Integrity Database Report"
         run: php artisan firefly-iii:report-integrity
@@ -63,7 +66,7 @@ jobs:
         run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
 
       - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
+        uses: SonarSource/sonarqube-scan-action@v5.2.0
         env:
           GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

app/Api/V1/Controllers/Autocomplete/TransactionController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
+use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -102,7 +103,7 @@ class TransactionController extends Controller
         if (is_numeric($data['query'])) {
             // search for group, not journal.
             $firstResult = $this->groupRepository->find((int) $data['query']);
-            if (null !== $firstResult) {
+            if ($firstResult instanceof TransactionGroup) {
                 // group may contain multiple journals, each a result:
                 foreach ($firstResult->transactionJournals as $journal) {
                     $result->push($journal);

app/Api/V1/Controllers/Chart/AccountController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Chart;
 
+use FireflyIII\Models\TransactionCurrency;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
@@ -99,7 +100,7 @@ class AccountController extends Controller
     private function renderAccountData(array $params, Account $account): void
     {
         $currency     = $this->repository->getAccountCurrency($account);
-        if (null === $currency) {
+        if (!$currency instanceof TransactionCurrency) {
             $currency = $this->default;
         }
         $currentSet   = [

app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 
+use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\DestroyRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -59,11 +60,11 @@ class DestroyController extends Controller
     public function destroy(DestroyRequest $request, TransactionCurrency $from, TransactionCurrency $to): JsonResponse
     {
         $date = $request->getDate();
-        if (null === $date) {
+        if (!$date instanceof Carbon) {
             throw new ValidationException('Date is required');
         }
         $rate = $this->repository->getSpecificRateOnDate($from, $to, $date);
-        if (null === $rate) {
+        if (!$rate instanceof CurrencyExchangeRate) {
             throw new NotFoundHttpException();
         }
         $this->repository->deleteRate($rate);

app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 
+use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreRequest;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
@@ -61,11 +62,11 @@ class StoreController extends Controller
 
         // already has rate?
         $object      = $this->repository->getSpecificRateOnDate($from, $to, $date);
-        if (null !== $object) {
+        if ($object instanceof CurrencyExchangeRate) {
             // just update it, no matter.
             $rate = $this->repository->updateExchangeRate($object, $rate, $date);
         }
-        if (null === $object) {
+        if (!$object instanceof CurrencyExchangeRate) {
             // store new
             $rate = $this->repository->storeExchangeRate($from, $to, $rate, $date);
         }

app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 
+use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
@@ -74,15 +75,15 @@ class DestroyController extends Controller
         if (!$this->userRepository->hasRole($admin, 'owner')) {
             // access denied:
             $messages = ['currency_code' => '200005: You need the "owner" role to do this.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
         if ($this->repository->currencyInUse($currency)) {
             $messages = ['currency_code' => '200006: Currency in use.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
         if ($this->repository->isFallbackCurrency($currency)) {
             $messages = ['currency_code' => '200026: Currency is fallback.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
 
         $this->repository->destroy($currency);

app/Api/V1/Controllers/Models/TransactionLink/StoreController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\TransactionLink;
 
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionLink\StoreRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -81,7 +82,7 @@ class StoreController extends Controller
         $data              = $request->getAll();
         $inward            = $this->journalRepository->find($data['inward_id'] ?? 0);
         $outward           = $this->journalRepository->find($data['outward_id'] ?? 0);
-        if (null === $inward || null === $outward) {
+        if (!$inward instanceof TransactionJournal || !$outward instanceof TransactionJournal) {
             throw new FireflyException('200024: Source or destination does not exist.');
         }
         $data['direction'] = 'inward';

app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
 
+use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\StoreRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -81,7 +82,7 @@ class StoreController extends Controller
         if (!$this->userRepository->hasRole($admin, 'owner')) {
             // access denied:
             $messages = ['name' => '200005: You need the "owner" role to do this.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
         $data        = $request->getAll();
         // if currency ID is 0, find the currency by the code:

app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
 
+use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\UpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -85,7 +86,7 @@ class UpdateController extends Controller
 
         if (!$this->userRepository->hasRole($admin, 'owner')) {
             $messages = ['name' => '200005: You need the "owner" role to do this.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
 
         $data        = $request->getAll();

app/Api/V1/Controllers/Summary/BasicController.php

@@ -674,15 +674,14 @@ class BasicController extends Controller
      */
     protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
     {
-        $result = false;
         if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
-            $result = true;
+            return true;
         }
         // start and end in the past? use $end
         if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
-            $result = true;
+            return true;
         }
 
-        return $result;
+        return false;
     }
 }

app/Api/V1/Controllers/System/ConfigurationController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\System;
 
+use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\System\UpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -158,7 +159,7 @@ class ConfigurationController extends Controller
         $rules     = ['value' => 'required'];
         if (!$this->repository->hasRole(auth()->user(), 'owner')) {
             $messages = ['value' => '200005: You need the "owner" role to do this.'];
-            \Validator::make([], $rules, $messages)->validate();
+            Validator::make([], $rules, $messages)->validate();
         }
         $data      = $request->getAll();
         $shortName = str_replace('configuration.', '', $name);

app/Api/V1/Requests/System/CronRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\System;
 
+use Carbon\Carbon;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -58,7 +59,7 @@ class CronRequest extends FormRequest
             $data['date'] = $this->getCarbonDate('date');
         }
         // catch NULL.
-        if (null === $data['date']) {
+        if (!$data['date'] instanceof Carbon) {
             $data['date'] = today(config('app.timezone'));
         }
 

app/Api/V2/Controllers/Autocomplete/AccountController.php

@@ -90,7 +90,7 @@ class AccountController extends Controller
             'meta'  => [
                 'type'                    => $account->accountType->type,
                 // TODO is multi currency property.
-                'currency_id'             => null === $currency ? null : (string) $currency->id,
+                'currency_id'             => $currency instanceof TransactionCurrency ? (string) $currency->id : null,
                 'currency_code'           => $currency?->code,
                 'currency_symbol'         => $currency?->symbol,
                 'currency_decimal_places' => $currency?->decimal_places,

app/Api/V2/Controllers/Chart/AccountController.php

@@ -94,7 +94,7 @@ class AccountController extends Controller
     private function renderAccountData(array $params, Account $account): void
     {
         $currency       = $this->repository->getAccountCurrency($account);
-        if (null === $currency) {
+        if (!$currency instanceof TransactionCurrency) {
             $currency = $this->default;
         }
         $currentSet     = [

app/Api/V2/Controllers/Controller.php

@@ -117,7 +117,7 @@ class Controller extends BaseController
                     app('log')->warning(sprintf('Ignored invalid date "%s" in API v2 controller parameter check: %s', substr((string) $date, 0, 20), $e->getMessage()));
                 }
                 // out of range? set to null.
-                if (null !== $obj && ($obj->year <= 1900 || $obj->year > 2099)) {
+                if ($obj instanceof Carbon && ($obj->year <= 1900 || $obj->year > 2099)) {
                     app('log')->warning(sprintf('Refuse to use date "%s" in API v2 controller parameter check: %s', $field, $obj->toAtomString()));
                     $obj = null;
                 }

app/Api/V2/Controllers/Summary/BasicController.php

@@ -398,15 +398,14 @@ class BasicController extends Controller
      */
     protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
     {
-        $result = false;
         if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
-            $result = true;
+            return true;
         }
         // start and end in the past? use $end
         if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
-            $result = true;
+            return true;
         }
 
-        return $result;
+        return false;
     }
 }

app/Api/V2/Controllers/Transaction/List/AccountController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Controllers\Transaction\List;
 
+use Carbon\Carbon;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Model\Transaction\ListRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -62,11 +63,11 @@ class AccountController extends Controller
 
         $start     = $request->getStartDate();
         $end       = $request->getEndDate();
-        if (null !== $start) {
+        if ($start instanceof Carbon) {
             app('log')->debug(sprintf('Set start date to %s', $start->toIso8601String()));
             $collector->setStart($start);
         }
-        if (null !== $end) {
+        if ($end instanceof Carbon) {
             app('log')->debug(sprintf('Set end date to %s', $start->toIso8601String()));
             $collector->setEnd($end);
         }

app/Api/V2/Request/Model/Transaction/InfiniteListRequest.php

@@ -53,7 +53,7 @@ class InfiniteListRequest extends FormRequest
 
         $start = $this->getStartDate();
         $end   = $this->getEndDate();
-        if (null !== $start && null !== $end) {
+        if ($start instanceof Carbon && $end instanceof Carbon) {
             $array['start'] = $start->format('Y-m-d');
             $array['end']   = $end->format('Y-m-d');
         }

app/Api/V2/Request/Model/Transaction/ListRequest.php

@@ -49,7 +49,7 @@ class ListRequest extends FormRequest
 
         $start = $this->getStartDate();
         $end   = $this->getEndDate();
-        if (null !== $start && null !== $end) {
+        if ($start instanceof Carbon && $end instanceof Carbon) {
             $array['start'] = $start->format('Y-m-d');
             $array['end']   = $end->format('Y-m-d');
         }

app/Console/Commands/Correction/CorrectsDatabase.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Schema;
 
 class CorrectsDatabase extends Command
 {
@@ -40,7 +41,7 @@ class CorrectsDatabase extends Command
     public function handle(): int
     {
         // if table does not exist, return false
-        if (!\Schema::hasTable('users')) {
+        if (!Schema::hasTable('users')) {
             $this->friendlyError('No "users"-table, will not continue.');
 
             return 1;

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -163,7 +163,7 @@ class CorrectsUnevenAmount extends Command
                 Log::error($e->getTraceAsString());
             }
             if (0 !== $res) {
-                $this->fixJournal($entry->transaction_journal_id);
+                $this->fixJournal((int) $entry->transaction_journal_id);
             }
         }
     }

app/Console/Commands/Integrity/ReportsIntegrity.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands\Integrity;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Schema;
 
 class ReportsIntegrity extends Command
 {
@@ -41,7 +42,7 @@ class ReportsIntegrity extends Command
     public function handle(): int
     {
         // if table does not exist, return false
-        if (!\Schema::hasTable('users')) {
+        if (!Schema::hasTable('users')) {
             return 1;
         }
         $commands = [

app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Schema;
 
 class AddsTransactionIdentifiers extends Command
 {
@@ -65,7 +66,7 @@ class AddsTransactionIdentifiers extends Command
         }
 
         // if table does not exist, return false
-        if (!\Schema::hasTable('transaction_journals')) {
+        if (!Schema::hasTable('transaction_journals')) {
             return 0;
         }
 

app/Factory/TransactionFactory.php

@@ -32,6 +32,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Rules\UniqueIban;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Validator;
 
 /**
  * Class TransactionFactory
@@ -152,7 +153,7 @@ class TransactionFactory
             return;
         }
         // validate info:
-        $validator = \Validator::make(['iban' => $this->accountInformation['iban']], [
+        $validator = Validator::make(['iban' => $this->accountInformation['iban']], [
             'iban' => ['required', new UniqueIban($this->account, $this->account->accountType->type)],
         ]);
         if ($validator->fails()) {

app/Handlers/Events/UserEventHandler.php

@@ -54,8 +54,8 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Auth\Events\Login;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
-use Mail;
 
 /**
  * Class UserEventHandler.
@@ -266,7 +266,7 @@ class UserEventHandler
         $url      = route('profile.confirm-email-change', [$token->data]);
 
         try {
-            \Mail::to($newEmail)->send(new ConfirmEmailChangeMail($newEmail, $oldEmail, $url));
+            Mail::to($newEmail)->send(new ConfirmEmailChangeMail($newEmail, $oldEmail, $url));
         } catch (\Exception $e) {
             app('log')->error($e->getMessage());
             app('log')->error($e->getTraceAsString());
@@ -291,7 +291,7 @@ class UserEventHandler
         $url      = route('profile.undo-email-change', [$token->data, $hashed]);
 
         try {
-            \Mail::to($oldEmail)->send(new UndoEmailChangeMail($newEmail, $oldEmail, $url));
+            Mail::to($oldEmail)->send(new UndoEmailChangeMail($newEmail, $oldEmail, $url));
         } catch (\Exception $e) {
             app('log')->error($e->getMessage());
             app('log')->error($e->getTraceAsString());
@@ -355,7 +355,7 @@ class UserEventHandler
         $url     = route('invite', [$event->invitee->invite_code]);
 
         try {
-            \Mail::to($invitee)->send(new InvitationMail($invitee, $admin, $url));
+            Mail::to($invitee)->send(new InvitationMail($invitee, $admin, $url));
         } catch (\Exception $e) {
             app('log')->error($e->getMessage());
             app('log')->error($e->getTraceAsString());

app/Http/Controllers/Account/EditController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
+use FireflyIII\Models\Location;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\AccountFormRequest;
@@ -87,11 +88,11 @@ class EditController extends Controller
         $roles                = $this->getRoles();
         $liabilityTypes       = $this->getLiabilityTypes();
         $location             = $repository->getLocation($account);
-        $latitude             = null !== $location ? $location->latitude : config('firefly.default_location.latitude');
+        $latitude             = $location instanceof Location ? $location->latitude : config('firefly.default_location.latitude');
-        $longitude            = null !== $location ? $location->longitude : config('firefly.default_location.longitude');
+        $longitude            = $location instanceof Location ? $location->longitude : config('firefly.default_location.longitude');
-        $zoomLevel            = null !== $location ? $location->zoom_level : config('firefly.default_location.zoom_level');
+        $zoomLevel            = $location instanceof Location ? $location->zoom_level : config('firefly.default_location.zoom_level');
         $canEditCurrency      = 0 === $account->piggyBanks()->count();
-        $hasLocation          = null !== $location;
+        $hasLocation          = $location instanceof Location;
         $locations            = [
             'location' => [
                 'latitude'     => old('location_latitude') ?? $latitude,

app/Http/Controllers/Account/ReconcileController.php

@@ -94,7 +94,7 @@ class ReconcileController extends Controller
 
         // get start and end
 
-        if (null === $start && null === $end) {
+        if (!$start instanceof Carbon && !$end instanceof Carbon) {
             /** @var Carbon $start */
             $start = clone session('start', app('navigation')->startOfPeriod(new Carbon(), $range));
 

app/Http/Controllers/Admin/UpdateController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
+use Carbon\Carbon;
 use FireflyIII\Helpers\Update\UpdateTrait;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
@@ -96,7 +97,7 @@ class UpdateController extends Controller
         $channel         = in_array($channel, ['stable', 'beta', 'alpha'], true) ? $channel : 'stable';
 
         app('fireflyconfig')->set('permission_update_check', $checkForUpdates);
-        app('fireflyconfig')->set('last_update_check', time());
+        app('fireflyconfig')->set('last_update_check', Carbon::now()->getTimestamp());
         app('fireflyconfig')->set('update_channel', $channel);
         session()->flash('success', (string) trans('firefly.configuration_updated'));
 

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -34,6 +34,8 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
+use function Safe\parse_url;
+
 /**
  * Class ForgotPasswordController
  */
@@ -101,7 +103,7 @@ class ForgotPasswordController extends Controller
      */
     private function validateHost(): void
     {
-        $configuredHost = \Safe\parse_url((string) config('app.url'), PHP_URL_HOST);
+        $configuredHost = parse_url((string) config('app.url'), PHP_URL_HOST);
         if (false === $configuredHost || null === $configuredHost) {
             throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.');
         }

app/Http/Controllers/Auth/LoginController.php

@@ -23,7 +23,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Auth;
 
-use Cookie;
+use Carbon\Carbon;
+use FireflyIII\User;
+use Illuminate\Support\Facades\Cookie;
 use FireflyIII\Events\ActuallyLoggedIn;
 use FireflyIII\Events\Security\UnknownUserAttemptedLogin;
 use FireflyIII\Events\Security\UserAttemptedLogin;
@@ -44,6 +46,7 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpFoundation\Response as ResponseAlias;
 
 /**
  * Class LoginController
@@ -130,11 +133,11 @@ class LoginController extends Controller
         app('log')->warning('Login attempt failed.');
         $username = (string) $request->get($this->username());
         $user     = $this->repository->findByEmail($username);
-        if (null === $user) {
+        if (!$user instanceof User) {
             // send event to owner.
             event(new UnknownUserAttemptedLogin($username));
         }
-        if (null !== $user) {
+        if ($user instanceof User) {
             event(new UserAttemptedLogin($user));
         }
 
@@ -198,7 +201,7 @@ class LoginController extends Controller
 
         // also logout current 2FA tokens.
         $cookieName = config('google2fa.cookie_name', 'google2fa_token');
-        \Cookie::forget($cookieName);
+        Cookie::forget($cookieName);
 
         $this->guard()->logout();
 
@@ -209,7 +212,7 @@ class LoginController extends Controller
         $this->loggedOut($request);
 
         return $request->wantsJson()
-            ? new Response('', 204)
+            ? new Response('', ResponseAlias::HTTP_NO_CONTENT)
             : redirect('/');
     }
 
@@ -220,7 +223,7 @@ class LoginController extends Controller
      *
      * @throws FireflyException
      */
-    public function showLoginForm(Request $request)
+    public function showLoginForm(?Request $request = null)
     {
         Log::channel('audit')->info('Show login form (1.1).');
 
@@ -246,13 +249,13 @@ class LoginController extends Controller
             $allowReset        = false;
         }
 
-        $email             = $request->old('email');
+        $email             = $request?->old('email');
-        $remember          = $request->old('remember');
+        $remember          = $request?->old('remember');
 
         $storeInCookie     = config('google2fa.store_in_cookie', false);
         if (false !== $storeInCookie) {
             $cookieName = config('google2fa.cookie_name', 'google2fa_token');
-            \Cookie::queue(\Cookie::make($cookieName, 'invalid-'.time()));
+            Cookie::queue(Cookie::make($cookieName, 'invalid-'.Carbon::now()->getTimestamp()));
         }
         $usernameField     = $this->username();
 

app/Http/Controllers/Auth/RegisterController.php

@@ -130,7 +130,7 @@ class RegisterController extends Controller
             $allowRegistration = false;
         }
         if ('web' !== $guard) {
-            $allowRegistration = false;
+            return false;
         }
 
         return $allowRegistration;
@@ -175,7 +175,7 @@ class RegisterController extends Controller
      *
      * @throws FireflyException
      */
-    public function showRegistrationForm(Request $request)
+    public function showRegistrationForm(?Request $request = null)
     {
         $isDemoSite        = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $pageTitle         = (string) trans('firefly.register_page_title');
@@ -187,7 +187,7 @@ class RegisterController extends Controller
             return view('error', compact('message'));
         }
 
-        $email             = $request->old('email');
+        $email             = $request?->old('email');
 
         return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
     }

app/Http/Controllers/Auth/TwoFactorController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Auth;
 
+use Carbon\Carbon;
 use FireflyIII\Events\Security\MFABackupFewLeft;
 use FireflyIII\Events\Security\MFABackupNoLeft;
 use FireflyIII\Events\Security\MFAManyFailedAttempts;
@@ -129,7 +130,7 @@ class TwoFactorController extends Controller
      */
     private function inMFAHistory(string $mfaCode, array $mfaHistory): bool
     {
-        $now = time();
+        $now = Carbon::now()->getTimestamp();
         foreach ($mfaHistory as $entry) {
             $time = $entry['time'];
             $code = $entry['code'];
@@ -149,7 +150,7 @@ class TwoFactorController extends Controller
         /** @var array $mfaHistory */
         $mfaHistory = app('preferences')->get('mfa_history', [])->data;
         $newHistory = [];
-        $now        = time();
+        $now        = Carbon::now()->getTimestamp();
         foreach ($mfaHistory as $entry) {
             $time = $entry['time'];
             $code = $entry['code'];
@@ -184,7 +185,7 @@ class TwoFactorController extends Controller
         /** @var array $mfaHistory */
         $mfaHistory   = app('preferences')->get('mfa_history', [])->data;
         $entry        = [
-            'time' => time(),
+            'time' => Carbon::now()->getTimestamp(),
             'code' => $mfaCode,
         ];
         $mfaHistory[] = $entry;

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -143,13 +143,13 @@ class BudgetLimitController extends Controller
         // first search for existing one and update it if necessary.
         $currency = $this->currencyRepos->find((int) $request->get('transaction_currency_id'));
         $budget   = $this->repository->find((int) $request->get('budget_id'));
-        if (null === $currency || null === $budget) {
+        if (!$currency instanceof TransactionCurrency || !$budget instanceof Budget) {
             throw new FireflyException('No valid currency or budget.');
         }
         $start    = Carbon::createFromFormat('Y-m-d', $request->get('start'));
         $end      = Carbon::createFromFormat('Y-m-d', $request->get('end'));
 
-        if (null === $start || null === $end) {
+        if (!$start instanceof Carbon || !$end instanceof Carbon) {
             return response()->json([]);
         }
 
@@ -167,7 +167,7 @@ class BudgetLimitController extends Controller
 
         // sanity check on amount:
         if (0 === bccomp($amount, '0')) {
-            if (null !== $limit) {
+            if ($limit instanceof BudgetLimit) {
                 $this->blRepository->destroyBudgetLimit($limit);
             }
 
@@ -181,11 +181,11 @@ class BudgetLimitController extends Controller
             $amount = bcmul($amount, '-1');
         }
 
-        if (null !== $limit) {
+        if ($limit instanceof BudgetLimit) {
             $limit->amount = $amount;
             $limit->save();
         }
-        if (null === $limit) {
+        if (!$limit instanceof BudgetLimit) {
             $limit = $this->blRepository->store(
                 [
                     'budget_id'   => $request->get('budget_id'),

app/Http/Controllers/Budget/EditController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Budget;
 
+use FireflyIII\Models\AutoBudget;
 use FireflyIII\Enums\AutoBudgetType;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -95,7 +96,7 @@ class EditController extends Controller
             'active'                  => $hasOldInput ? (bool) $request->old('active') : $budget->active,
             'auto_budget_currency_id' => $hasOldInput ? (int) $request->old('auto_budget_currency_id') : $this->defaultCurrency->id,
         ];
-        if (null !== $autoBudget) {
+        if ($autoBudget instanceof AutoBudget) {
             $amount                          = $hasOldInput ? $request->old('auto_budget_amount') : $autoBudget->amount;
             if (is_array($amount)) {
                 $amount = '0';

app/Http/Controllers/Budget/IndexController.php

@@ -316,7 +316,7 @@ class IndexController extends Controller
         foreach ($budgetIds as $index => $budgetId) {
             $budgetId = (int) $budgetId;
             $budget   = $repository->find($budgetId);
-            if (null !== $budget) {
+            if ($budget instanceof Budget) {
                 app('log')->debug(sprintf('Set budget #%d ("%s") to position %d', $budget->id, $budget->name, $index + 1));
                 $repository->setBudgetOrder($budget, $index + 1);
             }

app/Http/Controllers/Budget/ShowController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Budget;
 
+use FireflyIII\Models\TransactionJournal;
 use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
@@ -90,7 +91,7 @@ class ShowController extends Controller
 
         // get first journal ever to set off the budget period overview.
         $first     = $this->journalRepos->firstNull();
-        $firstDate = null !== $first ? $first->date : $start;
+        $firstDate = $first instanceof TransactionJournal ? $first->date : $start;
         $periods   = $this->getNoBudgetPeriodOverview($firstDate, $end);
         $page      = (int) $request->get('page');
         $pageSize  = (int) app('preferences')->get('listPageSize', 50)->data;
@@ -115,7 +116,7 @@ class ShowController extends Controller
     {
         $subTitle  = (string) trans('firefly.all_journals_without_budget');
         $first     = $this->journalRepos->firstNull();
-        $start     = null === $first ? new Carbon() : $first->date;
+        $start     = $first instanceof TransactionJournal ? $first->date : new Carbon();
         $end       = today(config('app.timezone'));
         $page      = (int) $request->get('page');
         $pageSize  = (int) app('preferences')->get('listPageSize', 50)->data;

app/Http/Controllers/Category/NoCategoryController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Category;
 
+use FireflyIII\Models\TransactionJournal;
 use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
@@ -119,7 +120,7 @@ class NoCategoryController extends Controller
         app('log')->debug('Start of noCategory()');
         $subTitle  = (string) trans('firefly.all_journals_without_category');
         $first     = $this->journalRepos->firstNull();
-        $start     = null === $first ? new Carbon() : $first->date;
+        $start     = $first instanceof TransactionJournal ? $first->date : new Carbon();
         $end       = today(config('app.timezone'));
         app('log')->debug(sprintf('Start for noCategory() is %s', $start->format('Y-m-d')));
         app('log')->debug(sprintf('End for noCategory() is %s', $end->format('Y-m-d')));

app/Http/Controllers/Chart/AccountController.php

@@ -43,6 +43,8 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
+use function Safe\json_encode;
+
 /**
  * Class AccountController.
  */
@@ -468,14 +470,14 @@ class AccountController extends Controller
         Log::debug('Balances exist at:');
         foreach ($range as $key => $value) {
             $newRange[] = ['date' => $key, 'info' => $value];
-            Log::debug(sprintf('%d - %s (%s)', count($newRange) - 1, $key, \Safe\json_encode($value)));
+            Log::debug(sprintf('%d - %s (%s)', count($newRange) - 1, $key, json_encode($value)));
         }
         $carbon          = Carbon::createFromFormat('Y-m-d', $newRange[0]['date'])->endOfDay();
         Log::debug(sprintf('Start of loop, $carbon is %s', $carbon->format('Y-m-d H:i:s')));
         while ($end->gte($current)) {
             $momentBalance = $previous;
             // $theDate       = $current->format('Y-m-d');
-            Log::debug(sprintf('Now at %s, with momentBalance %s', $current->format('Y-m-d H:i:s'), \Safe\json_encode($momentBalance)));
+            Log::debug(sprintf('Now at %s, with momentBalance %s', $current->format('Y-m-d H:i:s'), json_encode($momentBalance)));
 
             // loop over the array with balances, find one that is earlier or on the same day.
             while ($carbon->lte($current) && array_key_exists($expectedIndex, $newRange)) {
@@ -490,7 +492,7 @@ class AccountController extends Controller
                     $carbon = Carbon::createFromFormat('Y-m-d', $newRange[$expectedIndex]['date'])->endOfDay();
                 }
             }
-            Log::debug(sprintf('momentBalance is now %s', \Safe\json_encode($momentBalance)));
+            Log::debug(sprintf('momentBalance is now %s', json_encode($momentBalance)));
             $return        = $this->updateChartKeys($return, $momentBalance);
             $previous      = $momentBalance;
 

app/Http/Controllers/Chart/BudgetController.php

@@ -202,7 +202,7 @@ class BudgetController extends Controller
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);
-        $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
+        $budgetLimitId = $budgetLimit instanceof BudgetLimit ? $budgetLimit->id : 0;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
         $cache->addProperty($this->convertToNative);
@@ -211,7 +211,7 @@ class BudgetController extends Controller
         $start         = session('first', today(config('app.timezone'))->startOfYear());
         $end           = today();
 
-        if (null !== $budgetLimit) {
+        if ($budgetLimit instanceof BudgetLimit) {
             $start = $budgetLimit->start_date;
             $end   = $budgetLimit->end_date;
             $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setNormalCurrency($budgetLimit->transactionCurrency);
@@ -285,7 +285,7 @@ class BudgetController extends Controller
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);
-        $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
+        $budgetLimitId = $budgetLimit instanceof BudgetLimit ? $budgetLimit->id : 0;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
         $cache->addProperty($this->convertToNative);
@@ -293,7 +293,7 @@ class BudgetController extends Controller
         $cache->addProperty('chart.budget.expense-category');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
         $end           = today();
-        if (null !== $budgetLimit) {
+        if ($budgetLimit instanceof BudgetLimit) {
             $start = $budgetLimit->start_date;
             $end   = $budgetLimit->end_date;
             $collector->setNormalCurrency($budgetLimit->transactionCurrency);
@@ -367,7 +367,7 @@ class BudgetController extends Controller
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);
-        $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
+        $budgetLimitId = $budgetLimit instanceof BudgetLimit ? $budgetLimit->id : 0;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
         $cache->addProperty($budgetLimitId);
@@ -375,7 +375,7 @@ class BudgetController extends Controller
         $cache->addProperty('chart.budget.expense-expense');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
         $end           = today();
-        if (null !== $budgetLimit) {
+        if ($budgetLimit instanceof BudgetLimit) {
             $start = $budgetLimit->start_date;
             $end   = $budgetLimit->end_date;
             $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setNormalCurrency($budgetLimit->transactionCurrency);
@@ -529,7 +529,7 @@ class BudgetController extends Controller
 
             // get budget limit in this period for this currency.
             $limit                           = $this->blRepository->find($budget, $currency, $currentStart, $currentEnd);
-            if (null !== $limit) {
+            if ($limit instanceof BudgetLimit) {
                 $chartData[1]['entries'][$title] = app('steam')->bcround($limit->amount, $currency->decimal_places);
             }
 

app/Http/Controllers/Chart/CategoryController.php

@@ -159,7 +159,7 @@ class CategoryController extends Controller
         $income     = [];
         $expenses   = [];
         $categoryId = 0;
-        if (null === $category) {
+        if (!$category instanceof Category) {
             /** @var NoCategoryRepositoryInterface $noCatRepository */
             $noCatRepository = app(NoCategoryRepositoryInterface::class);
 
@@ -168,7 +168,7 @@ class CategoryController extends Controller
             $income          = $noCatRepository->listIncome($start, $end, $accounts);
         }
 
-        if (null !== $category) {
+        if ($category instanceof Category) {
             /** @var OperationsRepositoryInterface $opsRepository */
             $opsRepository = app(OperationsRepositoryInterface::class);
             $categoryId    = $category->id;

app/Http/Controllers/Controller.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use function Safe\realpath;
+use function Safe\ini_get;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
@@ -34,7 +36,7 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
-use Route;
+use Illuminate\Support\Facades\Route;
 
 /**
  * Class Controller.
@@ -83,15 +85,15 @@ abstract class Controller extends BaseController
         if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
             //config('view.layout','v1');
             Config::set('view.layout', 'v1');
-            View::getFinder()->setPaths([\Safe\realpath(base_path('resources/views'))]); // @phpstan-ignore-line
+            View::getFinder()->setPaths([realpath(base_path('resources/views'))]); // @phpstan-ignore-line
         }
 
         View::share('authGuard', $authGuard);
         View::share('logoutUrl', $logoutUrl);
 
         // upload size
-        $maxFileSize = Steam::phpBytes((string) \Safe\ini_get('upload_max_filesize'));
+        $maxFileSize = Steam::phpBytes((string) ini_get('upload_max_filesize'));
-        $maxPostSize = Steam::phpBytes((string) \Safe\ini_get('post_max_size'));
+        $maxPostSize = Steam::phpBytes((string) ini_get('post_max_size'));
         $uploadSize  = min($maxFileSize, $maxPostSize);
         View::share('uploadSize', $uploadSize);
 

app/Http/Controllers/DebugController.php

@@ -50,6 +50,9 @@ use Illuminate\View\View;
 use Monolog\Handler\RotatingFileHandler;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
+use function Safe\file_get_contents;
+use function Safe\ini_get;
+
 /**
  * Class DebugController
  */
@@ -139,7 +142,7 @@ class DebugController extends Controller
             if ($handler instanceof RotatingFileHandler) {
                 $logFile = $handler->getUrl();
                 if (null !== $logFile && file_exists($logFile)) {
-                    $logContent = \Safe\file_get_contents($logFile);
+                    $logContent = file_get_contents($logFile);
                 }
             }
         }
@@ -164,8 +167,8 @@ class DebugController extends Controller
 
     private function getSystemInformation(): array
     {
-        $maxFileSize   = Steam::phpBytes((string) \Safe\ini_get('upload_max_filesize'));
+        $maxFileSize   = Steam::phpBytes((string) ini_get('upload_max_filesize'));
-        $maxPostSize   = Steam::phpBytes((string) \Safe\ini_get('post_max_size'));
+        $maxPostSize   = Steam::phpBytes((string) ini_get('post_max_size'));
         $drivers       = DB::availableDrivers();
         $currentDriver = DB::getDriverName();
 
@@ -177,8 +180,8 @@ class DebugController extends Controller
             'interface'       => \PHP_SAPI,
             'bits'            => \PHP_INT_SIZE * 8,
             'bcscale'         => bcscale(),
-            'display_errors'  => \Safe\ini_get('display_errors'),
+            'display_errors'  => ini_get('display_errors'),
-            'error_reporting' => $this->errorReporting((int) \Safe\ini_get('error_reporting')),
+            'error_reporting' => $this->errorReporting((int) ini_get('error_reporting')),
             'upload_size'     => min($maxFileSize, $maxPostSize),
             'all_drivers'     => $drivers,
             'current_driver'  => $currentDriver,
@@ -197,7 +200,7 @@ class DebugController extends Controller
 
         try {
             if (file_exists('/var/www/counter-main.txt')) {
-                $return['build'] = trim((string) \Safe\file_get_contents('/var/www/counter-main.txt'));
+                $return['build'] = trim((string) file_get_contents('/var/www/counter-main.txt'));
                 app('log')->debug(sprintf('build is now "%s"', $return['build']));
             }
         } catch (\Exception $e) {
@@ -207,7 +210,7 @@ class DebugController extends Controller
 
         try {
             if (file_exists('/var/www/build-date-main.txt')) {
-                $return['build_date'] = trim((string) \Safe\file_get_contents('/var/www/build-date-main.txt'));
+                $return['build_date'] = trim((string) file_get_contents('/var/www/build-date-main.txt'));
             }
         } catch (\Exception $e) {
             app('log')->debug('Could not check build date, but thats ok.');

app/Http/Controllers/Export/IndexController.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Export;
 
+use Carbon\Carbon;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
@@ -84,14 +86,14 @@ class IndexController extends Controller
         $firstDate = today(config('app.timezone'));
         $firstDate->subYear();
         $journal   = $this->journalRepository->firstNull();
-        if (null !== $journal) {
+        if ($journal instanceof TransactionJournal) {
             Log::debug('First journal is NULL, using today() - 1 year.');
             $firstDate = clone $journal->date;
         }
         $generator->setStart($firstDate);
         $result    = $generator->export();
 
-        $name      = sprintf('%s_transaction_export.csv', date('Y_m_d'));
+        $name      = sprintf('%s_transaction_export.csv', Carbon::now()->format('Y_m_d'));
         $quoted    = sprintf('"%s"', addcslashes($name, '"\\'));
 
         // headers for CSV file.

app/Http/Controllers/JavascriptController.php

@@ -96,7 +96,7 @@ class JavascriptController extends Controller
     {
         $account                   = $repository->find((int) $request->get('account'));
         $currency                  = $this->defaultCurrency;
-        if (null !== $account) {
+        if ($account instanceof Account) {
             $currency = $repository->getAccountCurrency($account) ?? $this->defaultCurrency;
         }
         $locale                    = app('steam')->getLocale();

app/Http/Controllers/Json/BudgetController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Json;
 
+use FireflyIII\Models\AvailableBudget;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionCurrency;
@@ -72,7 +73,7 @@ class BudgetController extends Controller
         $available       = '0';
         $percentage      = '0';
 
-        if (null !== $availableBudget) {
+        if ($availableBudget instanceof AvailableBudget) {
             $available = $availableBudget->amount;
             if (0 !== bccomp($available, '0')) {
                 $percentage = bcmul(bcdiv($budgeted, $available), '100');

app/Http/Controllers/Json/ReconcileController.php

@@ -77,7 +77,7 @@ class ReconcileController extends Controller
         $amount          = '0';
         $clearedAmount   = '0';
 
-        if (null === $start && null === $end) {
+        if (!$start instanceof Carbon && !$end instanceof Carbon) {
             throw new FireflyException('Invalid dates submitted.');
         }
         if ($end->lt($start)) {
@@ -183,7 +183,7 @@ class ReconcileController extends Controller
      */
     public function transactions(Account $account, ?Carbon $start = null, ?Carbon $end = null)
     {
-        if (null === $start || null === $end) {
+        if (!$start instanceof Carbon || !$end instanceof Carbon) {
             throw new FireflyException('Invalid dates submitted.');
         }
         if ($end->lt($start)) {

app/Http/Controllers/Json/RecurrenceController.php

@@ -82,12 +82,12 @@ class RecurrenceController extends Controller
         $skip                          = $skip < 0 || $skip > 31 ? 0 : $skip;
         $weekend                       = $weekend < 1 || $weekend > 4 ? 1 : $weekend;
 
-        if (null === $endDate) {
+        if (!$endDate instanceof Carbon) {
             // safety catch:
             $endDate = now()->addYear();
         }
 
-        if (null === $start || null === $end || null === $firstDate) {
+        if (!$start instanceof Carbon || !$end instanceof Carbon || !$firstDate instanceof Carbon) {
             return response()->json();
         }
 
@@ -153,7 +153,7 @@ class RecurrenceController extends Controller
      */
     public function suggest(Request $request): JsonResponse
     {
-        $string      = '' === (string) $request->get('date') ? date('Y-m-d') : (string) $request->get('date');
+        $string      = '' === (string) $request->get('date') ? Carbon::now()->format('Y-m-d') : (string) $request->get('date');
         $today       = today(config('app.timezone'))->startOfDay();
 
         try {
@@ -161,7 +161,7 @@ class RecurrenceController extends Controller
         } catch (InvalidFormatException) {
             $date = Carbon::today(config('app.timezone'));
         }
-        if (null === $date) {
+        if (!$date instanceof Carbon) {
             return response()->json();
         }
         $date->startOfDay();

app/Http/Controllers/NewUserController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Requests\NewUserFormRequest;
@@ -101,7 +102,7 @@ class NewUserController extends Controller
         $currency      = $currencyRepository->find((int) $request->input('amount_currency_id_bank_balance'));
 
         // if is null, set to EUR:
-        if (null === $currency) {
+        if (!$currency instanceof TransactionCurrency) {
             $currency = $currencyRepository->findByCode('EUR');
         }
         $currencyRepository->enable($currency);

app/Http/Controllers/PreferencesController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Events\Preferences\UserGroupChangedDefaultCurrency;
 use FireflyIII\Events\Test\UserTestNotificationChannel;
@@ -40,6 +41,10 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
+use function Safe\json_decode;
+use function Safe\file_get_contents;
+use function Safe\strtotime;
+
 /**
  * Class PreferencesController.
  */
@@ -110,7 +115,7 @@ class PreferencesController extends Controller
         if (is_array($fiscalYearStartStr)) {
             $fiscalYearStartStr = '01-01';
         }
-        $fiscalYearStart                = sprintf('%s-%s', date('Y'), (string) $fiscalYearStartStr);
+        $fiscalYearStart                = sprintf('%s-%s', Carbon::now()->format('Y'), (string) $fiscalYearStartStr);
         $tjOptionalFields               = Preferences::get('transaction_journal_optional_fields', [])->data;
         $availableDarkModes             = config('firefly.available_dark_modes');
 
@@ -149,7 +154,7 @@ class PreferencesController extends Controller
         // list of locales also has "equal" which makes it equal to whatever the language is.
 
         try {
-            $locales = \Safe\json_decode((string) \Safe\file_get_contents(resource_path(sprintf('locales/%s/locales.json', $language))), true, 512, JSON_THROW_ON_ERROR);
+            $locales = json_decode((string) file_get_contents(resource_path(sprintf('locales/%s/locales.json', $language))), true, 512, JSON_THROW_ON_ERROR);
         } catch (\JsonException $e) {
             app('log')->error($e->getMessage());
             $locales = [];
@@ -271,9 +276,9 @@ class PreferencesController extends Controller
 
         // custom fiscal year
         $customFiscalYear  = 1 === (int) $request->get('customFiscalYear');
-        $string            = \Safe\strtotime((string) $request->get('fiscalYearStart'));
+        $string            = strtotime((string) $request->get('fiscalYearStart'));
         if (false !== $string) {
-            $fiscalYearStart = date('m-d', $string);
+            $fiscalYearStart = Carbon::createFromTimestamp($string)->format('m-d');
             Preferences::set('customFiscalYear', $customFiscalYear);
             Preferences::set('fiscalYearStart', $fiscalYearStart);
         }

app/Http/Controllers/Profile/MfaController.php

@@ -24,6 +24,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Profile;
 
+use Illuminate\Support\Facades\Cookie;
+use PragmaRX\Google2FALaravel\Facade as Google2FA;
+use Carbon\Carbon;
 use FireflyIII\Events\Security\DisabledMFA;
 use FireflyIII\Events\Security\EnabledMFA;
 use FireflyIII\Events\Security\MFANewBackupCodes;
@@ -181,7 +184,7 @@ class MfaController extends Controller
 
         // also logout current 2FA tokens.
         $cookieName = config('google2fa.cookie_name', 'google2fa_token');
-        \Cookie::forget($cookieName);
+        Cookie::forget($cookieName);
 
         // send user notification.
         Log::channel('audit')->info(sprintf('User "%s" has disabled MFA', $user->email));
@@ -214,8 +217,8 @@ class MfaController extends Controller
         }
 
         $domain     = $this->getDomain();
-        $secret     = \Google2FA::generateSecretKey();
+        $secret     = Google2FA::generateSecretKey();
-        $image      = \Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret);
+        $image      = Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret);
 
         app('preferences')->set('temp-mfa-secret', $secret);
 
@@ -271,7 +274,7 @@ class MfaController extends Controller
 
         // make sure MFA is logged out.
         if ('testing' !== config('app.env')) {
-            \Google2FA::logout();
+            Google2FA::logout();
         }
 
         // drop all info from session:
@@ -294,7 +297,7 @@ class MfaController extends Controller
         /** @var array $mfaHistory */
         $mfaHistory   = app('preferences')->get('mfa_history', [])->data;
         $entry        = [
-            'time' => time(),
+            'time' => Carbon::now()->getTimestamp(),
             'code' => $mfaCode,
         ];
         $mfaHistory[] = $entry;
@@ -311,7 +314,7 @@ class MfaController extends Controller
         /** @var array $mfaHistory */
         $mfaHistory = app('preferences')->get('mfa_history', [])->data;
         $newHistory = [];
-        $now        = time();
+        $now        = Carbon::now()->getTimestamp();
         foreach ($mfaHistory as $entry) {
             $time = $entry['time'];
             $code = $entry['code'];

app/Http/Controllers/ProfileController.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 use FireflyIII\Events\UserChangedEmail;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Exceptions\ValidationException;
@@ -154,7 +156,8 @@ class ProfileController extends Controller
         if (0 === $count) {
             /** @var ClientRepository $repository */
             $repository = app(ClientRepository::class);
-            $repository->createPersonalAccessClient(null, config('app.name').' Personal Access Client', 'http://localhost');
+            $name       = sprintf('%s Personal Access Grant Client', config('app.name'));
+            $repository->createPersonalAccessClient(null, $name, 'http://localhost');
         }
 
         $accessToken    = app('preferences')->get('access_token');
@@ -201,9 +204,9 @@ class ProfileController extends Controller
             return redirect(route('profile.change-email'))->withInput();
         }
         $existing = $repository->findByEmail($newEmail);
-        if (null !== $existing) {
+        if ($existing instanceof User) {
             // force user logout.
-            \Auth::guard()->logout(); // @phpstan-ignore-line (does not recognize function)
+            Auth::guard()->logout(); // @phpstan-ignore-line (does not recognize function)
             $request->session()->invalidate();
 
             session()->flash('success', (string) trans('firefly.email_changed'));
@@ -217,7 +220,7 @@ class ProfileController extends Controller
         event(new UserChangedEmail($user, $newEmail, $oldEmail));
 
         // force user logout.
-        \Auth::guard()->logout(); // @phpstan-ignore-line (does not recognize function)
+        Auth::guard()->logout(); // @phpstan-ignore-line (does not recognize function)
         $request->session()->invalidate();
         session()->flash('success', (string) trans('firefly.email_changed'));
 
@@ -310,7 +313,7 @@ class ProfileController extends Controller
             return redirect(route('profile.index'));
         }
 
-        if (!\Hash::check($request->get('password'), auth()->user()->password)) {
+        if (!Hash::check($request->get('password'), auth()->user()->password)) {
             session()->flash('error', (string) trans('firefly.invalid_password'));
 
             return redirect(route('profile.delete-account'));
@@ -343,8 +346,8 @@ class ProfileController extends Controller
             'email'    => auth()->user()->email,
             'password' => $request->get('password'),
         ];
-        if (\Auth::once($creds)) {
+        if (Auth::once($creds)) {
-            \Auth::logoutOtherDevices($request->get('password'));
+            Auth::logoutOtherDevices($request->get('password'));
             session()->flash('info', (string) trans('firefly.other_sessions_logged_out'));
 
             return redirect(route('profile.index'));

app/Http/Controllers/Rule/CreateController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Rule;
 
+use FireflyIII\Models\Rule;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\RuleFormRequest;
@@ -128,7 +129,7 @@ class CreateController extends Controller
 
         // title depends on whether or not there is a rule group:
         $subTitle     = (string) trans('firefly.make_new_rule_no_group');
-        if (null !== $ruleGroup) {
+        if ($ruleGroup instanceof RuleGroup) {
             $subTitle = (string) trans('firefly.make_new_rule', ['title' => $ruleGroup->title]);
         }
 
@@ -252,7 +253,7 @@ class CreateController extends Controller
     {
         $ruleId = (int) $request->get('id');
         $rule   = $this->ruleRepos->find($ruleId);
-        if (null !== $rule) {
+        if ($rule instanceof Rule) {
             $this->ruleRepos->duplicate($rule);
         }
 

app/Http/Controllers/RuleGroup/EditController.php

@@ -91,7 +91,7 @@ class EditController extends Controller
     {
         $groupId   = (int) $request->get('id');
         $ruleGroup = $this->repository->find($groupId);
-        if (null !== $ruleGroup) {
+        if ($ruleGroup instanceof RuleGroup) {
             $direction = $request->get('direction');
             if ('down' === $direction) {
                 $maxOrder = $this->repository->maxOrder();

app/Http/Controllers/System/InstallController.php

@@ -24,7 +24,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\System;
 
-use Cache;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
 use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -36,6 +37,8 @@ use Illuminate\View\View;
 use Laravel\Passport\Passport;
 use phpseclib3\Crypt\RSA;
 
+use function Safe\file_put_contents;
+
 /**
  * Class InstallController
  */
@@ -140,14 +143,14 @@ class InstallController extends Controller
                 $this->keys();
             }
             if ('generate-keys' !== $command) {
-                \Artisan::call($command, $args);
+                Artisan::call($command, $args);
-                app('log')->debug(\Artisan::output());
+                app('log')->debug(Artisan::output());
             }
         } catch (\Exception $e) { // intentional generic exception
             throw new FireflyException($e->getMessage(), 0, $e);
         }
         // clear cache as well.
-        \Cache::clear();
+        Cache::clear();
         app('preferences')->mark();
 
         return true;
@@ -169,7 +172,7 @@ class InstallController extends Controller
             return;
         }
 
-        \Safe\file_put_contents($publicKey, (string) $key->getPublicKey());
+        file_put_contents($publicKey, (string) $key->getPublicKey());
-        \Safe\file_put_contents($privateKey, $key->toString('PKCS1'));
+        file_put_contents($privateKey, $key->toString('PKCS1'));
     }
 }

app/Http/Controllers/TagController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use FireflyIII\Models\Location;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
@@ -124,10 +125,10 @@ class TagController extends Controller
         $subTitleIcon = 'fa-tag';
 
         $location     = $this->repository->getLocation($tag);
-        $latitude     = null !== $location ? $location->latitude : config('firefly.default_location.latitude');
+        $latitude     = $location instanceof Location ? $location->latitude : config('firefly.default_location.latitude');
-        $longitude    = null !== $location ? $location->longitude : config('firefly.default_location.longitude');
+        $longitude    = $location instanceof Location ? $location->longitude : config('firefly.default_location.longitude');
-        $zoomLevel    = null !== $location ? $location->zoom_level : config('firefly.default_location.zoom_level');
+        $zoomLevel    = $location instanceof Location ? $location->zoom_level : config('firefly.default_location.zoom_level');
-        $hasLocation  = null !== $location;
+        $hasLocation  = $location instanceof Location;
         $locations    = [
             'location' => [
                 'latitude'     => old('location_latitude') ?? $latitude,
@@ -155,8 +156,8 @@ class TagController extends Controller
     {
         // start with oldest tag
         $first           = session('first', today()) ?? today();
-        $oldestTagDate   = null === $repository->oldestTag() ? clone $first : $repository->oldestTag()->date;
+        $oldestTagDate   = $repository->oldestTag() instanceof Tag ? $repository->oldestTag()->date : clone $first;
-        $newestTagDate   = null === $repository->newestTag() ? today() : $repository->newestTag()->date;
+        $newestTagDate   = $repository->newestTag() instanceof Tag ? $repository->newestTag()->date : today();
         $oldestTagDate->startOfYear();
         $newestTagDate->endOfYear();
         $tags            = [];
@@ -184,7 +185,7 @@ class TagController extends Controller
         foreach ($tags as $tagId) {
             $tagId = (int) $tagId;
             $tag   = $this->repository->find($tagId);
-            if (null !== $tag) {
+            if ($tag instanceof Tag) {
                 $this->repository->destroy($tag);
                 ++$count;
             }

app/Http/Controllers/Transaction/ConvertController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
+use FireflyIII\Models\TransactionCurrency;
 use Exception;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
@@ -342,7 +343,7 @@ class ConvertController extends Controller
             $sourceCurrency = $this->accountRepository->getAccountCurrency($source);
             $dest           = $this->accountRepository->find((int) $destinationId);
             $destCurrency   = $this->accountRepository->getAccountCurrency($dest);
-            if (null !== $sourceCurrency && null !== $destCurrency && $sourceCurrency->code !== $destCurrency->code) {
+            if ($sourceCurrency instanceof TransactionCurrency && $destCurrency instanceof TransactionCurrency && $sourceCurrency->code !== $destCurrency->code) {
                 $update['currency_id']         = $sourceCurrency->id;
                 $update['foreign_currency_id'] = $destCurrency->id;
                 $update['foreign_amount']      = '1'; // not the best solution but at this point the amount is hard to get.

app/Http/Controllers/Transaction/CreateController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
+use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -35,6 +36,8 @@ use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
+use function Safe\parse_url;
+
 /**
  * Class CreateController
  */
@@ -65,7 +68,7 @@ class CreateController extends Controller
         $groupId = (int) $request->get('id');
         if (0 !== $groupId) {
             $group = $this->repository->find($groupId);
-            if (null !== $group) {
+            if ($group instanceof TransactionGroup) {
                 /** @var GroupCloneService $service */
                 $service  = app(GroupCloneService::class);
                 $newGroup = $service->cloneGroup($group);
@@ -116,7 +119,7 @@ class CreateController extends Controller
         $accountToTypes             = config('firefly.account_to_transaction');
         $defaultCurrency            = $this->defaultCurrency;
         $previousUrl                = $this->rememberPreviousUrl('transactions.create.url');
-        $parts                      = \Safe\parse_url($previousUrl);
+        $parts                      = parse_url((string) $previousUrl);
         $search                     = sprintf('?%s', $parts['query'] ?? '');
         $previousUrl                = str_replace($search, '', $previousUrl);
         if (!is_array($optionalFields)) {

app/Http/Controllers/Transaction/EditController.php

@@ -35,6 +35,8 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 
+use function Safe\parse_url;
+
 /**
  * Class EditController
  */
@@ -85,7 +87,7 @@ class EditController extends Controller
         $defaultCurrency            = $this->defaultCurrency;
         $cash                       = $repository->getCashAccount();
         $previousUrl                = $this->rememberPreviousUrl('transactions.edit.url');
-        $parts                      = \Safe\parse_url($previousUrl);
+        $parts                      = parse_url((string) $previousUrl);
         $search                     = sprintf('?%s', $parts['query'] ?? '');
         $previousUrl                = str_replace($search, '', $previousUrl);
 

app/Http/Controllers/Transaction/IndexController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
+use FireflyIII\Models\TransactionJournal;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -81,14 +82,14 @@ class IndexController extends Controller
         $page          = (int) $request->get('page');
         $pageSize      = (int) app('preferences')->get('listPageSize', 50)->data;
 
-        if (null === $start) {
+        if (!$start instanceof Carbon) {
             $start = session('start');
             $end   = session('end');
         }
         if (null === $end) {
             // get last transaction ever?
             $last = $this->repository->getLast();
-            $end  = null !== $last ? $last->date : session('end');
+            $end  = $last instanceof TransactionJournal ? $last->date : session('end');
         }
 
         [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
@@ -97,7 +98,7 @@ class IndexController extends Controller
         $subTitle      = (string) trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
         $path          = route('transactions.index', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $firstJournal  = $this->repository->firstNull();
-        $startPeriod   = null === $firstJournal ? new Carbon() : $firstJournal->date;
+        $startPeriod   = $firstJournal instanceof TransactionJournal ? $firstJournal->date : new Carbon();
         $endPeriod     = clone $end;
         $periods       = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod);
 
@@ -132,9 +133,9 @@ class IndexController extends Controller
         $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
         $path         = route('transactions.index.all', [$objectType]);
         $first        = $this->repository->firstNull();
-        $start        = null === $first ? new Carbon() : $first->date;
+        $start        = $first instanceof TransactionJournal ? $first->date : new Carbon();
         $last         = $this->repository->getLast();
-        $end          = null !== $last ? $last->date : today(config('app.timezone'));
+        $end          = $last instanceof TransactionJournal ? $last->date : today(config('app.timezone'));
         $subTitle     = (string) trans('firefly.all_'.$objectType);
 
         /** @var GroupCollectorInterface $collector */

app/Http/Controllers/Transaction/LinkController.php

@@ -113,7 +113,7 @@ class LinkController extends Controller
 
         app('log')->debug('We are here (store)');
         $other         = $this->journalRepository->find($linkInfo['transaction_journal_id']);
-        if (null === $other) {
+        if (!$other instanceof TransactionJournal) {
             session()->flash('error', (string) trans('firefly.invalid_link_selection'));
 
             return redirect(route('transactions.show', [$journal->transaction_group_id]));

app/Http/Controllers/Transaction/MassController.php

@@ -191,7 +191,7 @@ class MassController extends Controller
     private function updateJournal(int $journalId, MassEditJournalRequest $request): void
     {
         $journal = $this->repository->find($journalId);
-        if (null === $journal) {
+        if (!$journal instanceof TransactionJournal) {
             throw new FireflyException(sprintf('Trying to edit non-existent or deleted journal #%d', $journalId));
         }
         $service = app(JournalUpdateService::class);

app/Http/Controllers/TransactionCurrency/CreateController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\TransactionCurrency;
 
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\CurrencyFormRequest;
@@ -122,7 +123,7 @@ class CreateController extends Controller
         }
         $redirect        = redirect($this->getPreviousUrl('currencies.create.url'));
 
-        if (null !== $currency) {
+        if ($currency instanceof TransactionCurrency) {
             $request->session()->flash('success', (string) trans('firefly.created_currency', ['name' => $currency->name]));
             Log::channel('audit')->info('Created (POST) currency.', $data);
             if (1 === (int) $request->get('create_another')) {

app/Http/Middleware/AcceptHeaders.php

@@ -29,6 +29,8 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
+use function Safe\preg_match;
+
 class AcceptHeaders
 {
     /**
@@ -71,7 +73,7 @@ class AcceptHeaders
 
         // throw bad request if trace id is not a UUID
         $uuid         = $request->header('X-Trace-Id');
-        if (is_string($uuid) && '' !== trim($uuid) && (1 !== \Safe\preg_match('/^[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}$/i', trim($uuid)))) {
+        if (is_string($uuid) && '' !== trim($uuid) && (1 !== preg_match('/^[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}$/i', trim($uuid)))) {
             throw new BadRequestHttpException('Bad X-Trace-Id header.');
         }
 

app/Http/Middleware/Authenticate.php

@@ -114,10 +114,10 @@ class Authenticate
      */
     private function validateBlockedUser(?User $user, array $guards): void
     {
-        if (null === $user) {
+        if (!$user instanceof User) {
             app('log')->warning('User is null, throw exception?');
         }
-        if (null !== $user) {
+        if ($user instanceof User) {
             // app('log')->debug(get_class($user));
             if (1 === (int) $user->blocked) {
                 $message = (string) trans('firefly.block_account_logout');

app/Http/Middleware/Range.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Illuminate\Support\Facades\App;
 use Carbon\Carbon;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
@@ -101,7 +102,7 @@ class Range
         // get locale preference:
         $language          = app('steam')->getLanguage();
         $locale            = app('steam')->getLocale();
-        \App::setLocale($language);
+        App::setLocale($language);
         Carbon::setLocale(substr((string) $locale, 0, 2));
 
         $localeArray       = app('steam')->getLocaleArray($locale);

app/Http/Requests/CurrencyFormRequest.php

@@ -70,7 +70,7 @@ class CurrencyFormRequest extends FormRequest
         $currency = $this->route()->parameter('currency');
 
         if (null !== $currency) {
-            $rules = [
+            return [
                 'name'           => 'required|max:48|min:1',
                 'code'           => 'required|min:3|max:51',
                 'symbol'         => 'required|min:1|max:51',

app/Http/Requests/ReportFormRequest.php

@@ -36,6 +36,8 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Validator;
 
+use function Safe\preg_match;
+
 /**
  * Class CategoryFormRequest.
  */
@@ -143,7 +145,7 @@ class ReportFormRequest extends FormRequest
             // validate as date
             // if regex for YYYY-MM-DD:
             $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
-            $result  = \Safe\preg_match($pattern, $string);
+            $result  = preg_match($pattern, $string);
             if (false !== $result && 0 !== $result) {
                 try {
                     $date = new Carbon($parts[1]);
@@ -181,7 +183,7 @@ class ReportFormRequest extends FormRequest
             // validate as date
             // if regex for YYYY-MM-DD:
             $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
-            $result  = \Safe\preg_match($pattern, $string);
+            $result  = preg_match($pattern, $string);
             if (false !== $result && 0 !== $result) {
                 try {
                     $date = new Carbon($parts[0]);

app/Jobs/MailError.php

@@ -28,6 +28,7 @@ use Illuminate\Mail\Message;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
 use Symfony\Component\Mailer\Exception\TransportException;
 
 /**
@@ -70,7 +71,7 @@ class MailError extends Job implements ShouldQueue
 
         if ($this->attempts() < 3 && '' !== $email) {
             try {
-                \Mail::send(
+                Mail::send(
                     ['emails.error-html', 'emails.error-text'],
                     $args,
                     static function (Message $message) use ($email): void {

app/Providers/AppServiceProvider.php

@@ -41,6 +41,7 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Schema::defaultStringLength(191);
+        // Passport::$clientUuids = false;
         Response::macro('api', function (array $value) {
             $headers = [
                 'Cache-Control' => 'no-store',
@@ -58,7 +59,7 @@ class AppServiceProvider extends ServiceProvider
 
         // blade extension
         Blade::directive('activeXRoutePartial', function (string $route) {
-            $name = \Route::getCurrentRoute()->getName() ?? '';
+            $name = Route::getCurrentRoute()->getName() ?? '';
             if (str_contains($name, $route)) {
                 return 'menu-open';
             }

app/Services/Internal/Support/AccountServiceTrait.php

@@ -39,6 +39,7 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService;
+use Illuminate\Support\Facades\Validator;
 
 /**
  * Trait AccountServiceTrait
@@ -54,7 +55,7 @@ trait AccountServiceTrait
         }
         $data      = ['iban' => $iban];
         $rules     = ['iban' => 'required|iban'];
-        $validator = \Validator::make($data, $rules);
+        $validator = Validator::make($data, $rules);
         if ($validator->fails()) {
             app('log')->info(sprintf('Detected invalid IBAN ("%s"). Return NULL instead.', $iban));
 

app/Support/ExpandedForm.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support;
 
-use Eloquent;
+use Illuminate\Database\Eloquent\Model;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Form\FormSupport;
 use Illuminate\Support\Collection;
@@ -205,7 +205,7 @@ class ExpandedForm
         $selectList[0] = '(none)';
         $fields        = ['title', 'name', 'description'];
 
-        /** @var \Eloquent $entry */
+        /** @var Model $entry */
         foreach ($set as $entry) {
             // All Eloquent models have an ID
             $entryId              = $entry->id;

app/Support/FireflyConfig.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\Configuration;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Contracts\Encryption\EncryptException;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -38,8 +39,8 @@ class FireflyConfig
     public function delete(string $name): void
     {
         $fullName = 'ff-config-'.$name;
-        if (\Cache::has($fullName)) {
+        if (Cache::has($fullName)) {
-            \Cache::forget($fullName);
+            Cache::forget($fullName);
         }
         Configuration::where('name', $name)->forceDelete();
     }
@@ -80,8 +81,8 @@ class FireflyConfig
     public function get(string $name, mixed $default = null): ?Configuration
     {
         $fullName = 'ff-config-'.$name;
-        if (\Cache::has($fullName)) {
+        if (Cache::has($fullName)) {
-            return \Cache::get($fullName);
+            return Cache::get($fullName);
         }
 
         try {
@@ -92,7 +93,7 @@ class FireflyConfig
         }
 
         if (null !== $config) {
-            \Cache::forever($fullName, $config);
+            Cache::forever($fullName, $config);
 
             return $config;
         }
@@ -122,13 +123,13 @@ class FireflyConfig
             $item->name = $name;
             $item->data = $value;
             $item->save();
-            \Cache::forget('ff-config-'.$name);
+            Cache::forget('ff3-config-'.$name);
 
             return $item;
         }
         $config->data = $value;
         $config->save();
-        \Cache::forget('ff-config-'.$name);
+        Cache::forget('ff3-config-'.$name);
 
         return $config;
     }

app/Support/Http/Controllers/RequestInformation.php

@@ -33,7 +33,7 @@ use FireflyIII\User;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\Validator;
-use Route as RouteFacade;
+use Illuminate\Support\Facades\Route as RouteFacade;
 
 /**
  * Trait RequestInformation

app/Support/System/OAuthKeys.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Support\System;
 
 use FireflyIII\Exceptions\FireflyException;
 use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Crypt;
 use Laravel\Passport\Console\KeysCommand;
 use Psr\Container\ContainerExceptionInterface;
@@ -88,8 +89,8 @@ class OAuthKeys
 
     public static function generateKeys(): void
     {
-        \Artisan::registerCommand(new KeysCommand());
+        Artisan::registerCommand(new KeysCommand());
-        \Artisan::call('firefly-iii:laravel-passport-keys');
+        Artisan::call('firefly-iii:laravel-passport-keys');
     }
 
     public static function storeKeysInDB(): void

app/Support/Twig/General.php

@@ -33,7 +33,7 @@ use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Search\OperatorQuerySearch;
 use Illuminate\Support\Facades\Log;
 use League\CommonMark\GithubFlavoredMarkdownConverter;
-use Route;
+use Illuminate\Support\Facades\Route;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
@@ -247,7 +247,7 @@ class General extends AbstractExtension
             static function (): string {
                 $args  = func_get_args();
                 $route = $args[0]; // name of the route.
-                $name  = \Route::getCurrentRoute()->getName() ?? '';
+                $name  = Route::getCurrentRoute()->getName() ?? '';
                 if (str_contains($name, $route)) {
                     return 'active';
                 }
@@ -271,7 +271,7 @@ class General extends AbstractExtension
 
                 if ($objectType === $activeObjectType
                     && false !== stripos(
-                        (string) \Route::getCurrentRoute()->getName(),
+                        (string) Route::getCurrentRoute()->getName(),
                         (string) $route
                     )) {
                     return 'active';
@@ -294,7 +294,7 @@ class General extends AbstractExtension
             static function (): string {
                 $args  = func_get_args();
                 $route = $args[0]; // name of the route.
-                $name  = \Route::getCurrentRoute()->getName() ?? '';
+                $name  = Route::getCurrentRoute()->getName() ?? '';
                 if (str_contains($name, $route)) {
                     return 'menu-open';
                 }

app/TransactionRules/Actions/SetDestinationAccount.php

@@ -116,6 +116,18 @@ class SetDestinationAccount implements ActionInterface
         if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
             $newAccount = $this->findWithdrawalDestinationAccount($accountName);
         }
+        if (null === $newAccount) {
+            app('log')->error(
+                sprintf(
+                    'No destination account found for name "%s".',
+                    $accountName
+                )
+            );
+
+            event(new RuleActionFailedOnArray($this->action, $journal, trans('rules.no_destination', ['name' => $accountName])));
+
+            return false;
+        }
 
         app('log')->debug(sprintf('New destination account is #%d ("%s").', $newAccount->id, $newAccount->name));
 

app/User.php

@@ -61,6 +61,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Str;
 use Laravel\Passport\HasApiTokens;
 use NotificationChannels\Pushover\PushoverReceiver;
@@ -464,7 +465,7 @@ class User extends Authenticatable
      */
     public function sendPasswordResetNotification($token): void
     {
-        $ipAddress = \Request::ip();
+        $ipAddress = Request::ip();
 
         event(new RequestedNewPassword($this, $token, $ipAddress));
     }

app/Validation/FireflyValidator.php

@@ -44,6 +44,7 @@ use Illuminate\Validation\Validator;
 use PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException;
 use PragmaRX\Google2FA\Exceptions\InvalidCharactersException;
 use PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException;
+use PragmaRX\Google2FALaravel\Facade;
 
 /**
  * Class FireflyValidator.
@@ -79,7 +80,7 @@ class FireflyValidator extends Validator
         }
         $secret           = (string) $secret;
 
-        return (bool) \Google2FA::verifyKey($secret, $value);
+        return (bool) Facade::verifyKey($secret, $value);
     }
 
     /**
@@ -131,7 +132,7 @@ class FireflyValidator extends Validator
         }
         $secret = (string) $user->mfa_secret;
 
-        return (bool) \Google2FA::verifyKey($secret, $value);
+        return (bool) Facade::verifyKey($secret, $value);
     }
 
     /**

changelog.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.2.15 - 2025-05-26
+
+### Fixed
+
+- Restore missing facades.
+
+## 6.2.14 - 2025-05-26
+
+### Fixed
+
+- [Issue 10356](https://github.com/firefly-iii/firefly-iii/issues/10356) (Call to undefined method createPersonalAccessClient()) reported by @JC5
+- [Issue 10357](https://github.com/firefly-iii/firefly-iii/issues/10357) (Target AuthorizationViewResponse is not instantiable) reported by @JC5
+
+## 6.2.13 - 2025-05-25
+
+### Fixed
+
+- [Issue 10114](https://github.com/firefly-iii/firefly-iii/issues/10114) (Budget for foreign currency not getting updated when a transaction refers to it) reported by @srikakulamts
+- [Issue 10180](https://github.com/firefly-iii/firefly-iii/issues/10180) (missing SPENT info) reported by @frank-bg
+- [Issue 10197](https://github.com/firefly-iii/firefly-iii/issues/10197) (Add rule number) reported by @gogoizzy
+- [PR 10203](https://github.com/firefly-iii/firefly-iii/pull/10203) (Fix Ukrainian language names) reported by @den-is
+- [Issue 10265](https://github.com/firefly-iii/firefly-iii/issues/10265) (Liabilities, foreign currencies have some issues (payment/exchange with native currency)) reported by @jgmm81
+- [Issue 10290](https://github.com/firefly-iii/firefly-iii/issues/10290) (edit multiple transactions individually ignores reconciled state) reported by @goebeler
+- [Issue 10302](https://github.com/firefly-iii/firefly-iii/issues/10302) (Attempt to read property "id" on null Error) reported by @XBadPlayerX
+- [Issue 10305](https://github.com/firefly-iii/firefly-iii/issues/10305) (The info icon used to display transactions is not clickable in the default financial reports "budgets by accounts"-section's sum column) reported by @goebeler
+- [Issue 10308](https://github.com/firefly-iii/firefly-iii/issues/10308) (Liabilities, with some details (payment/exchange with native currency)) reported by @jgmm81
+- [Issue 10320](https://github.com/firefly-iii/firefly-iii/issues/10320) (Button to update transaction keeps being disabled after correcting form errors) reported by @Astro1247
+- [Issue 10336](https://github.com/firefly-iii/firefly-iii/issues/10336) (New install recovering backup from 5.7.18 fails to run.  ($param) must be of type int, string given in orrectsUnevenAmount.php) reported by @perezalvarezhi
+
 ## 6.2.12 - 2025-04-21
 
 ### Fixed

composer.json

@@ -89,7 +89,7 @@
         "jc5/recovery": "^2",
         "laravel-notification-channels/pushover": "^4.0",
         "laravel/framework": "^12",
-        "laravel/passport": "^13.",
+        "laravel/passport": "^12.0",
         "laravel/sanctum": "^4.1",
         "laravel/slack-notification-channel": "^3.3",
         "laravel/ui": "^4.2",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "404a3c73aa12057d75eaf3fb298d9a82",
+    "content-hash": "b630645d62adf0b4c2a9a16ccfc7a3cc",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -1879,16 +1879,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v12.14.1",
+            "version": "v12.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "84b142958d1638a7e89de94ce75c2821c601d3d7"
+                "reference": "2ef7fb183f18e547af4eb9f5a55b2ac1011f0b77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/84b142958d1638a7e89de94ce75c2821c601d3d7",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/2ef7fb183f18e547af4eb9f5a55b2ac1011f0b77",
-                "reference": "84b142958d1638a7e89de94ce75c2821c601d3d7",
+                "reference": "2ef7fb183f18e547af4eb9f5a55b2ac1011f0b77",
                 "shasum": ""
             },
             "require": {
@@ -2090,48 +2090,47 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-05-13T17:50:51+00:00"
+            "time": "2025-05-20T15:10:44+00:00"
         },
         {
             "name": "laravel/passport",
-            "version": "v13.0.1",
+            "version": "v12.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/passport.git",
-                "reference": "d96323a1c3699efe51ca477c3dd8fdd6500d7997"
+                "reference": "65a885607b62d361aedaeb10a946bc6b5a954262"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/d96323a1c3699efe51ca477c3dd8fdd6500d7997",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/65a885607b62d361aedaeb10a946bc6b5a954262",
-                "reference": "d96323a1c3699efe51ca477c3dd8fdd6500d7997",
+                "reference": "65a885607b62d361aedaeb10a946bc6b5a954262",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "ext-openssl": "*",
                 "firebase/php-jwt": "^6.4",
-                "illuminate/auth": "^11.35|^12.0",
+                "illuminate/auth": "^9.21|^10.0|^11.0|^12.0",
-                "illuminate/console": "^11.35|^12.0",
+                "illuminate/console": "^9.21|^10.0|^11.0|^12.0",
-                "illuminate/container": "^11.35|^12.0",
+                "illuminate/container": "^9.21|^10.0|^11.0|^12.0",
-                "illuminate/contracts": "^11.35|^12.0",
+                "illuminate/contracts": "^9.21|^10.0|^11.0|^12.0",
-                "illuminate/cookie": "^11.35|^12.0",
+                "illuminate/cookie": "^9.21|^10.0|^11.0|^12.0",
-                "illuminate/database": "^11.35|^12.0",
+                "illuminate/database": "^9.21|^10.0|^11.0|^12.0",
-                "illuminate/encryption": "^11.35|^12.0",
+                "illuminate/encryption": "^9.21|^10.0|^11.0|^12.0",
-                "illuminate/http": "^11.35|^12.0",
+                "illuminate/http": "^9.21|^10.0|^11.0|^12.0",
-                "illuminate/support": "^11.35|^12.0",
+                "illuminate/support": "^9.21|^10.0|^11.0|^12.0",
-                "league/oauth2-server": "^9.2",
+                "lcobucci/jwt": "^4.3|^5.0",
-                "php": "^8.2",
+                "league/oauth2-server": "^8.5.3",
-                "php-http/discovery": "^1.20",
+                "nyholm/psr7": "^1.5",
-                "phpseclib/phpseclib": "^3.0",
+                "php": "^8.0",
-                "psr/http-factory-implementation": "*",
+                "phpseclib/phpseclib": "^2.0|^3.0",
-                "symfony/console": "^7.1",
+                "symfony/console": "^6.0|^7.0",
-                "symfony/psr-http-message-bridge": "^7.1"
+                "symfony/psr-http-message-bridge": "^2.1|^6.0|^7.0"
             },
             "require-dev": {
-                "mockery/mockery": "^1.6",
+                "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^9.9|^10.0",
+                "orchestra/testbench": "^7.35|^8.14|^9.0|^10.0",
-                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^11.5|^12.0"
+                "phpunit/phpunit": "^9.3|^10.5|^11.5"
             },
             "type": "library",
             "extra": {
@@ -2167,7 +2166,7 @@
                 "issues": "https://github.com/laravel/passport/issues",
                 "source": "https://github.com/laravel/passport"
             },
-            "time": "2025-05-07T17:16:06+00:00"
+            "time": "2025-02-12T16:11:33+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -2900,34 +2899,29 @@
         },
         {
             "name": "league/event",
-            "version": "3.0.3",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/event.git",
-                "reference": "ec38ff7ea10cad7d99a79ac937fbcffb9334c210"
+                "reference": "062ebb450efbe9a09bc2478e89b7c933875b0935"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/event/zipball/ec38ff7ea10cad7d99a79ac937fbcffb9334c210",
+                "url": "https://api.github.com/repos/thephpleague/event/zipball/062ebb450efbe9a09bc2478e89b7c933875b0935",
-                "reference": "ec38ff7ea10cad7d99a79ac937fbcffb9334c210",
+                "reference": "062ebb450efbe9a09bc2478e89b7c933875b0935",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0",
+                "php": ">=7.1.0"
-                "psr/event-dispatcher": "^1.0"
-            },
-            "provide": {
-                "psr/event-dispatcher-implementation": "1.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.16",
+                "henrikbjorn/phpspec-code-coverage": "~1.0.1",
-                "phpstan/phpstan": "^0.12.45",
+                "phpspec/phpspec": "^2.2"
-                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "2.2-dev"
                 }
             },
             "autoload": {
@@ -2953,9 +2947,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/event/issues",
-                "source": "https://github.com/thephpleague/event/tree/3.0.3"
+                "source": "https://github.com/thephpleague/event/tree/2.3.0"
             },
-            "time": "2024-09-04T16:06:53+00:00"
+            "time": "2025-03-14T19:51:10+00:00"
         },
         {
             "name": "league/flysystem",
@@ -3217,46 +3211,38 @@
         },
         {
             "name": "league/oauth2-server",
-            "version": "9.2.0",
+            "version": "8.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-server.git",
-                "reference": "00323013403e1a1e0f424affafca56c28b60c22c"
+                "reference": "cc8778350f905667e796b3c2364a9d3bd7a73518"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/00323013403e1a1e0f424affafca56c28b60c22c",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/cc8778350f905667e796b3c2364a9d3bd7a73518",
-                "reference": "00323013403e1a1e0f424affafca56c28b60c22c",
+                "reference": "cc8778350f905667e796b3c2364a9d3bd7a73518",
                 "shasum": ""
             },
             "require": {
-                "defuse/php-encryption": "^2.4",
+                "defuse/php-encryption": "^2.3",
-                "ext-json": "*",
                 "ext-openssl": "*",
-                "lcobucci/clock": "^2.3 || ^3.0",
+                "lcobucci/clock": "^2.2 || ^3.0",
-                "lcobucci/jwt": "^5.0",
+                "lcobucci/jwt": "^4.3 || ^5.0",
-                "league/event": "^3.0",
+                "league/event": "^2.2",
-                "league/uri": "^7.0",
+                "league/uri": "^6.7 || ^7.0",
-                "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+                "php": "^8.0",
-                "psr/http-message": "^2.0",
+                "psr/http-message": "^1.0.1 || ^2.0"
-                "psr/http-server-middleware": "^1.0"
             },
             "replace": {
                 "league/oauth2server": "*",
                 "lncd/oauth2": "*"
             },
             "require-dev": {
-                "laminas/laminas-diactoros": "^3.5",
+                "laminas/laminas-diactoros": "^3.0.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3.2",
+                "phpstan/phpstan": "^0.12.57",
-                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan-phpunit": "^0.12.16",
-                "phpstan/phpstan": "^1.12",
+                "phpunit/phpunit": "^9.6.6",
-                "phpstan/phpstan-deprecation-rules": "^1.1.4",
+                "roave/security-advisories": "dev-master"
-                "phpstan/phpstan-phpunit": "^1.3.15",
-                "phpstan/phpstan-strict-rules": "^1.5.2",
-                "phpunit/phpunit": "^9.6.21",
-                "roave/security-advisories": "dev-master",
-                "slevomat/coding-standard": "^8.14.1",
-                "squizlabs/php_codesniffer": "^3.8"
             },
             "type": "library",
             "autoload": {
@@ -3301,7 +3287,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-server/issues",
-                "source": "https://github.com/thephpleague/oauth2-server/tree/9.2.0"
+                "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.5"
             },
             "funding": [
                 {
@@ -3309,7 +3295,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-15T00:49:10+00:00"
+            "time": "2024-12-20T23:06:10+00:00"
         },
         {
             "name": "league/uri",
@@ -5117,16 +5103,16 @@
         },
         {
             "name": "predis/predis",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/predis/predis.git",
-                "reference": "7d86f7afb37940bfc7aaa2909147616881377667"
+                "reference": "34fb0a7da0330df1bab4280fcac4afdeeccc3edf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/7d86f7afb37940bfc7aaa2909147616881377667",
+                "url": "https://api.github.com/repos/predis/predis/zipball/34fb0a7da0330df1bab4280fcac4afdeeccc3edf",
-                "reference": "7d86f7afb37940bfc7aaa2909147616881377667",
+                "reference": "34fb0a7da0330df1bab4280fcac4afdeeccc3edf",
                 "shasum": ""
             },
             "require": {
@@ -5168,7 +5154,7 @@
             ],
             "support": {
                 "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v3.0.0"
+                "source": "https://github.com/predis/predis/tree/v3.0.1"
             },
             "funding": [
                 {
@@ -5176,7 +5162,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-02T23:18:59+00:00"
+            "time": "2025-05-16T18:30:32+00:00"
         },
         {
             "name": "psr/cache",
@@ -5538,119 +5524,6 @@
             },
             "time": "2023-04-04T09:54:51+00:00"
         },
-        {
-            "name": "psr/http-server-handler",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-server-handler.git",
-                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
-                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0",
-                "psr/http-message": "^1.0 || ^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Server\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP server-side request handler",
-            "keywords": [
-                "handler",
-                "http",
-                "http-interop",
-                "psr",
-                "psr-15",
-                "psr-7",
-                "request",
-                "response",
-                "server"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/http-server-handler/tree/1.0.2"
-            },
-            "time": "2023-04-10T20:06:20+00:00"
-        },
-        {
-            "name": "psr/http-server-middleware",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-server-middleware.git",
-                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
-                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0",
-                "psr/http-message": "^1.0 || ^2.0",
-                "psr/http-server-handler": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Server\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP server-side middleware",
-            "keywords": [
-                "http",
-                "http-interop",
-                "middleware",
-                "psr",
-                "psr-15",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "support": {
-                "issues": "https://github.com/php-fig/http-server-middleware/issues",
-                "source": "https://github.com/php-fig/http-server-middleware/tree/1.0.2"
-            },
-            "time": "2023-04-11T06:14:47+00:00"
-        },
         {
             "name": "psr/log",
             "version": "3.0.2",
@@ -6648,16 +6521,16 @@
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b"
+                "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/5d68a57d66910405e5c0b63d6f0af941e66fc868",
-                "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b",
+                "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868",
                 "shasum": ""
             },
             "require": {
@@ -6671,7 +6544,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -6704,7 +6577,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/cache-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -6720,7 +6593,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2025-03-13T15:25:07+00:00"
         },
         {
             "name": "symfony/clock",
@@ -6956,16 +6829,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
                 "shasum": ""
             },
             "require": {
@@ -6978,7 +6851,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -7003,7 +6876,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -7019,7 +6892,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/error-handler",
@@ -7178,16 +7051,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
-                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
                 "shasum": ""
             },
             "require": {
@@ -7201,7 +7074,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -7234,7 +7107,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -7250,7 +7123,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/expression-language",
@@ -7477,16 +7350,16 @@
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.5.2",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645"
+                "reference": "75d7043853a42837e68111812f4d964b01e5101c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/75d7043853a42837e68111812f4d964b01e5101c",
-                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645",
+                "reference": "75d7043853a42837e68111812f4d964b01e5101c",
                 "shasum": ""
             },
             "require": {
@@ -7499,7 +7372,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -7535,7 +7408,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -7551,7 +7424,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-07T08:49:48+00:00"
+            "time": "2025-04-29T11:18:49+00:00"
         },
         {
             "name": "symfony/http-foundation",
@@ -8909,16 +8782,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
                 "shasum": ""
             },
             "require": {
@@ -8936,7 +8809,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -8972,7 +8845,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -8988,7 +8861,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2025-04-25T09:37:31+00:00"
         },
         {
             "name": "symfony/string",
@@ -9174,16 +9047,16 @@
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c"
+                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
-                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c",
+                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
                 "shasum": ""
             },
             "require": {
@@ -9196,7 +9069,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -9232,7 +9105,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -9248,7 +9121,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-27T08:32:26+00:00"
         },
         {
             "name": "symfony/uid",
@@ -9485,16 +9358,16 @@
         },
         {
             "name": "thecodingmachine/safe",
-            "version": "3.3.0",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thecodingmachine/safe.git",
-                "reference": "51a45c524c0f074493565a9deaa39025f19b2b24"
+                "reference": "2cdd579eeaa2e78e51c7509b50cc9fb89a956236"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/51a45c524c0f074493565a9deaa39025f19b2b24",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/2cdd579eeaa2e78e51c7509b50cc9fb89a956236",
-                "reference": "51a45c524c0f074493565a9deaa39025f19b2b24",
+                "reference": "2cdd579eeaa2e78e51c7509b50cc9fb89a956236",
                 "shasum": ""
             },
             "require": {
@@ -9604,7 +9477,7 @@
             "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
             "support": {
                 "issues": "https://github.com/thecodingmachine/safe/issues",
-                "source": "https://github.com/thecodingmachine/safe/tree/3.3.0"
+                "source": "https://github.com/thecodingmachine/safe/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -9620,7 +9493,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-13T20:06:28+00:00"
+            "time": "2025-05-14T06:15:44+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -11163,16 +11036,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.14",
+            "version": "2.1.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2"
+                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f2e03099cac24ff3b379864d171c5acbfc6b9a2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
-                "reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2",
+                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
                 "shasum": ""
             },
             "require": {
@@ -11217,25 +11090,25 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-02T15:32:28+00:00"
+            "time": "2025-05-21T20:55:28+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-deprecation-rules.git",
-                "reference": "9d8e7d4e32711715ad78a1fb6ec368df9af01fdf"
+                "reference": "468e02c9176891cc901143da118f09dc9505fc2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/9d8e7d4e32711715ad78a1fb6ec368df9af01fdf",
+                "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/468e02c9176891cc901143da118f09dc9505fc2f",
-                "reference": "9d8e7d4e32711715ad78a1fb6ec368df9af01fdf",
+                "reference": "468e02c9176891cc901143da118f09dc9505fc2f",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0",
-                "phpstan/phpstan": "^2.1.13"
+                "phpstan/phpstan": "^2.1.15"
             },
             "require-dev": {
                 "php-parallel-lint/php-parallel-lint": "^1.2",
@@ -11262,9 +11135,9 @@
             "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.2"
+                "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.3"
             },
-            "time": "2025-04-26T19:59:57+00:00"
+            "time": "2025-05-14T10:56:57+00:00"
         },
         {
             "name": "phpstan/phpstan-strict-rules",
@@ -11316,16 +11189,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "12.2.1",
+            "version": "12.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "448f2c504d86dbff3949dcd02c95aa85db2c7617"
+                "reference": "9075a8efc66e11bc55c319062e147bdb06777267"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/448f2c504d86dbff3949dcd02c95aa85db2c7617",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9075a8efc66e11bc55c319062e147bdb06777267",
-                "reference": "448f2c504d86dbff3949dcd02c95aa85db2c7617",
+                "reference": "9075a8efc66e11bc55c319062e147bdb06777267",
                 "shasum": ""
             },
             "require": {
@@ -11352,7 +11225,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "12.2.x-dev"
+                    "dev-main": "12.3.x-dev"
                 }
             },
             "autoload": {
@@ -11381,7 +11254,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.2.1"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.0"
             },
             "funding": [
                 {
@@ -11401,7 +11274,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-04T05:25:05+00:00"
+            "time": "2025-05-23T15:49:03+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -11650,16 +11523,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.1.5",
+            "version": "12.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f93ef2198df8d54b3195bcee381a33be51d8705e"
+                "reference": "2fdf0056c673c8f0f1eed00030be5f8243c1e6e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f93ef2198df8d54b3195bcee381a33be51d8705e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2fdf0056c673c8f0f1eed00030be5f8243c1e6e0",
-                "reference": "f93ef2198df8d54b3195bcee381a33be51d8705e",
+                "reference": "2fdf0056c673c8f0f1eed00030be5f8243c1e6e0",
                 "shasum": ""
             },
             "require": {
@@ -11681,7 +11554,7 @@
                 "sebastian/cli-parser": "^4.0.0",
                 "sebastian/comparator": "^7.0.1",
                 "sebastian/diff": "^7.0.0",
-                "sebastian/environment": "^8.0.0",
+                "sebastian/environment": "^8.0.1",
                 "sebastian/exporter": "^7.0.0",
                 "sebastian/global-state": "^8.0.0",
                 "sebastian/object-enumerator": "^7.0.0",
@@ -11727,7 +11600,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.1.5"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.1.6"
             },
             "funding": [
                 {
@@ -11751,7 +11624,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-11T06:44:52+00:00"
+            "time": "2025-05-21T12:36:31+00:00"
         },
         {
             "name": "rector/rector",
@@ -12076,16 +11949,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "8.0.0",
+            "version": "8.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "8afe311eca49171bf95405cc0078be9a3821f9f2"
+                "reference": "d364b9e5d0d3b18a2573351a1786fbf96b7e0792"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8afe311eca49171bf95405cc0078be9a3821f9f2",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d364b9e5d0d3b18a2573351a1786fbf96b7e0792",
-                "reference": "8afe311eca49171bf95405cc0078be9a3821f9f2",
+                "reference": "d364b9e5d0d3b18a2573351a1786fbf96b7e0792",
                 "shasum": ""
             },
             "require": {
@@ -12128,15 +12001,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
                 "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/8.0.0"
+                "source": "https://github.com/sebastianbergmann/environment/tree/8.0.2"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/environment",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-02-07T04:56:08+00:00"
+            "time": "2025-05-21T15:05:44+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -12679,22 +12564,22 @@
         },
         {
             "name": "thecodingmachine/phpstan-safe-rule",
-            "version": "v1.4.0",
+            "version": "v1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thecodingmachine/phpstan-safe-rule.git",
-                "reference": "33dcbc3228c55ea4c364ecf74a3661cf7b7f168d"
+                "reference": "5f9795eae8891dffa475965463a4281633651768"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/phpstan-safe-rule/zipball/33dcbc3228c55ea4c364ecf74a3661cf7b7f168d",
+                "url": "https://api.github.com/repos/thecodingmachine/phpstan-safe-rule/zipball/5f9795eae8891dffa475965463a4281633651768",
-                "reference": "33dcbc3228c55ea4c364ecf74a3661cf7b7f168d",
+                "reference": "5f9795eae8891dffa475965463a4281633651768",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^5",
                 "php": "^8.1",
-                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan": "^2.1.11",
                 "thecodingmachine/safe": "^1.2 || ^2.0 || ^3.0"
             },
             "require-dev": {
@@ -12731,9 +12616,9 @@
             "description": "A PHPStan rule to detect safety issues. Must be used in conjunction with thecodingmachine/safe",
             "support": {
                 "issues": "https://github.com/thecodingmachine/phpstan-safe-rule/issues",
-                "source": "https://github.com/thecodingmachine/phpstan-safe-rule/tree/v1.4.0"
+                "source": "https://github.com/thecodingmachine/phpstan-safe-rule/tree/v1.4.1"
             },
-            "time": "2025-02-11T12:41:29+00:00"
+            "time": "2025-04-09T20:30:35+00:00"
         },
         {
             "name": "theseer/tokenizer",

config/app.php

@@ -42,15 +42,10 @@ use FireflyIII\Providers\SearchServiceProvider;
 use FireflyIII\Providers\SessionServiceProvider;
 use FireflyIII\Providers\TagServiceProvider;
 use FireflyIII\Support\Facades\AccountForm;
-use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\CurrencyForm;
 use FireflyIII\Support\Facades\ExpandedForm;
-use FireflyIII\Support\Facades\FireflyConfig;
-use FireflyIII\Support\Facades\Navigation;
 use FireflyIII\Support\Facades\PiggyBankForm;
-use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Facades\RuleForm;
-use FireflyIII\Support\Facades\Steam;
 use Illuminate\Auth\AuthServiceProvider;
 use Illuminate\Auth\Passwords\PasswordResetServiceProvider;
 use Illuminate\Broadcasting\BroadcastServiceProvider;
@@ -58,7 +53,6 @@ use Illuminate\Bus\BusServiceProvider;
 use Illuminate\Cache\CacheServiceProvider;
 use Illuminate\Cookie\CookieServiceProvider;
 use Illuminate\Database\DatabaseServiceProvider;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Encryption\EncryptionServiceProvider;
 use Illuminate\Filesystem\FilesystemServiceProvider;
 use Illuminate\Foundation\Providers\ConsoleSupportServiceProvider;
@@ -70,47 +64,15 @@ use Illuminate\Pagination\PaginationServiceProvider;
 use Illuminate\Pipeline\PipelineServiceProvider;
 use Illuminate\Queue\QueueServiceProvider;
 use Illuminate\Redis\RedisServiceProvider;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Facades\Broadcast;
-use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Cookie;
-use Illuminate\Support\Facades\Crypt;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\Notification;
-use Illuminate\Support\Facades\Password;
-use Illuminate\Support\Facades\Queue;
-use Illuminate\Support\Facades\Redirect;
-use Illuminate\Support\Facades\Redis;
-use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Session;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Facades\View;
-use Illuminate\Support\Str;
 use Illuminate\Translation\TranslationServiceProvider;
 use Illuminate\Validation\ValidationServiceProvider;
 use Illuminate\View\ViewServiceProvider;
-use PragmaRX\Google2FALaravel\Facade;
 use Spatie\Html\Facades\Html;
-use TwigBridge\Facade\Twig;
 use TwigBridge\ServiceProvider;
 
 return [
@@ -179,56 +141,17 @@ return [
         RecurringServiceProvider::class,
     ],
     'aliases'         => [
-        'App'           => App::class,
-        'Artisan'       => Artisan::class,
         'Auth'          => Auth::class,
-        'Blade'         => Blade::class,
-        'Broadcast'     => Broadcast::class,
-        'Bus'           => Bus::class,
-        'Cache'         => Cache::class,
-        'Config'        => Config::class,
-        'Cookie'        => Cookie::class,
-        'Crypt'         => Crypt::class,
-        'DB'            => DB::class,
-        'Eloquent'      => Model::class,
-        'Event'         => Event::class,
-        'File'          => File::class,
-        'Gate'          => Gate::class,
-        'Hash'          => Hash::class,
-        'Lang'          => Lang::class,
-        'Log'           => Log::class,
-        'Mail'          => Mail::class,
-        'Notification'  => Notification::class,
-        'Password'      => Password::class,
-        'Queue'         => Queue::class,
-        'Redirect'      => Redirect::class,
-        'Redis'         => Redis::class,
-        'Request'       => Request::class,
-        'Response'      => Response::class,
         'Route'         => Route::class,
-        'Schema'        => Schema::class,
+        'Config'        => Config::class,
         'Session'       => Session::class,
-        'Storage'       => Storage::class,
         'URL'           => URL::class,
-        'Validator'     => Validator::class,
-        'View'          => View::class,
         'Html'          => Html::class,
-        'Preferences'   => Preferences::class,
-        'FireflyConfig' => FireflyConfig::class,
-        'Navigation'    => Navigation::class,
-        'Amount'        => Amount::class,
-        'Steam'         => Steam::class,
-        'ExpandedForm'  => ExpandedForm::class,
-        'CurrencyForm'  => CurrencyForm::class,
         'AccountForm'   => AccountForm::class,
+        'CurrencyForm'  => CurrencyForm::class,
+        'ExpandedForm'  => ExpandedForm::class,
         'PiggyBankForm' => PiggyBankForm::class,
         'RuleForm'      => RuleForm::class,
-        'Google2FA'     => Facade::class,
-        'Twig'          => Twig::class,
-
-        'Arr'           => Arr::class,
-        'Http'          => Http::class,
-        'Str'           => Str::class,
     ],
 
     'asset_url'       => env('ASSET_URL', null),

config/firefly.php

@@ -78,7 +78,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-05-14',
+    'version'                      => 'develop/2025-05-26',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

config/session.php

@@ -32,7 +32,7 @@ return [
     'table'           => 'sessions',
     'store'           => null,
     'lottery'         => [2, 100],
-    'cookie'          => 'firefly_session',
+    'cookie'          => env('COOKIE_NAME', 'firefly_iii_session'),
     'path'            => env('COOKIE_PATH', '/'),
     'domain'          => env('COOKIE_DOMAIN', null),
     'secure'          => env('COOKIE_SECURE', null),

database/migrations/2016_06_16_000000_create_support_tables.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class CreateSupportTables.

database/migrations/2016_06_16_000001_create_users_table.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class CreateUsersTable.

database/migrations/2016_06_16_000002_create_main_tables.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class CreateMainTables.

database/migrations/2016_09_12_121359_fix_nullables.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class FixNullables.

database/migrations/2016_10_09_150037_expand_transactions_table.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class ExpandTransactionsTable.

database/migrations/2016_10_22_075804_changes_for_v410.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class ChangesForV410.

database/migrations/2016_11_24_210552_changes_for_v420.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class ChangesForV420.

database/migrations/2016_12_22_150431_changes_for_v430.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class ChangesForV430.

database/migrations/2016_12_28_203205_changes_for_v431.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class ChangesForV431.

database/migrations/2017_04_13_163623_changes_for_v440.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class ChangesForV440.

database/migrations/2017_06_02_105232_changes_for_v450.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class ChangesForV450.

database/migrations/2018_03_19_141348_changes_for_v472.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class ChangesForV472.

database/migrations/2018_06_08_200526_changes_for_v475.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class ChangesForV475.