Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix phpstan issues.
James Cole4856997a237f
diff --git a/app/Console/Commands/Correction/RestoresOAuthKeys.php b/app/Console/Commands/Correction/RestoresOAuthKeys.phpindex ad430a73c3..53690a6ee1 100644--- a/app/Console/Commands/Correction/RestoresOAuthKeys.php+++ b/app/Console/Commands/Correction/RestoresOAuthKeys.php@@ -29,6 +29,7 @@ use FireflyIII\Support\System\OAuthKeys;use Illuminate\Console\Command;use Illuminate\Support\Facades\Log;use Laravel\Passport\Passport;+use function Safe\chmod;class RestoresOAuthKeys extends Command{diff --git a/app/Http/Controllers/Profile/OAuthController.php b/app/Http/Controllers/Profile/OAuthController.phpindex 2d8e9a511f..51ad524588 100644--- a/app/Http/Controllers/Profile/OAuthController.php+++ b/app/Http/Controllers/Profile/OAuthController.php@@ -19,6 +19,8 @@* along with this program. If not, see <https://www.gnu.org/licenses/>.*/+declare(strict_types=1);+namespace FireflyIII\Http\Controllers\Profile;use FireflyIII\Http\Controllers\Controller;@@ -33,13 +35,12 @@ use Illuminate\Support\Facades\Log;use Laravel\Passport\Client;use Laravel\Passport\ClientRepository;use Laravel\Passport\Token;-use Laravel\Passport\TokenRepository;class OAuthController extends Controller{protected bool $internalAuth;- public function __construct(protected ClientRepository $clients, protected TokenRepository $tokenRepository, protected ValidationFactory $validation)+ public function __construct(protected ClientRepository $clients, protected ValidationFactory $validation){parent::__construct();@@ -56,6 +57,9 @@ class OAuthController extends Controller$this->middleware(IsDemoUser::class)->except(['index']);}+ /**+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\View\View+ */public function index(){$count = DB::table('oauth_clients')->where('grant_types', '["personal_access"]')->whereNull('owner_id')->count();@@ -102,7 +106,7 @@ class OAuthController extends Controller$client = auth()->user()->oauthApps()->where('revoked', false)->find($clientId);- if (!$client) {+ if (null === $client) {return new Response('', 404);}//$client->@@ -117,7 +121,7 @@ class OAuthController extends Controller{$client = auth()->user()->oauthApps()->where('revoked', false)->find($clientId);- if (!$client) {+ if (null === $client) {return new Response('', 404);}@@ -135,10 +139,10 @@ class OAuthController extends Controllerpublic function destroyClient(Request $request, string $clientId): Response{- /** @var Client $client */+ /** @var Client|null $client */$client = auth()->user()->oauthApps()->where('revoked', false)->find($clientId);- if (!$client) {+ if (null === $client) {return new Response('', 404);}@@ -162,10 +166,7 @@ class OAuthController extends Controllerpublic function destroyPersonalAccessToken(Request $request, string $tokenId): Response{-// auth()->user()->fin- $token = $this->tokenRepository->findForUser(- $tokenId, $request->user()- );+ $token = auth()->user()->tokens()->where('revoked', false)->find($tokenId);if (is_null($token)) {return new Response('', 404);diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.phpindex f6afc8d32d..d5beb9be62 100644--- a/app/Http/Middleware/VerifyCsrfToken.php+++ b/app/Http/Middleware/VerifyCsrfToken.php@@ -23,7 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;-use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;+use Illuminate\Foundation\Http\Middleware\PreventRequestForgery as MiddleWare;/*** Class VerifyCsrfToken.diff --git a/app/Support/System/OAuthKeys.php b/app/Support/System/OAuthKeys.phpindex a6b525fa2a..741a2f807e 100644--- a/app/Support/System/OAuthKeys.php+++ b/app/Support/System/OAuthKeys.php@@ -38,6 +38,7 @@ use Safe\Exceptions\FilesystemException;use function Safe\file_get_contents;use function Safe\file_put_contents;+use function Safe\chmod;/*** Class OAuthKeysdiff --git a/database/migrations/2026_04_13_185808_migrations_04_2026.php b/database/migrations/2026_04_13_185808_migrations_04_2026.phpindex 4ec5be717c..cd5cc16461 100644--- a/database/migrations/2026_04_13_185808_migrations_04_2026.php+++ b/database/migrations/2026_04_13_185808_migrations_04_2026.php@@ -1,5 +1,7 @@<?php+declare(strict_types=1);+use Illuminate\Database\Eloquent\Model;use Illuminate\Database\Migrations\Migration;use Illuminate\Database\Schema\Blueprint;diff --git a/routes/web.php b/routes/web.phpindex 44830e5ea9..2780f27e3c 100644--- a/routes/web.php+++ b/routes/web.php@@ -56,13 +56,7 @@ Route::group();// laravel passport routes-//Route::group(-// [-// 'as' => 'passport.',-// 'prefix' => config('passport.path', 'oauth'),-// 'namespace' => '\Laravel\Passport\Http\Controllers',-// ],-// function (): void {+// // routes with no extra middleware// Route::post('/token', ['uses' => 'AccessTokenController@issueToken', 'as' => 'token', 'middleware' => 'throttle']);// Route::get('/authorize', ['uses' => 'AuthorizationController@authorize', 'as' => 'authorizations.authorize', 'middleware' => 'user-full-auth']);@@ -76,9 +70,6 @@ Route::group(// Route::get('/tokens', ['uses' => 'AuthorizedAccessTokenController@forUser', 'as' => 'tokens.index']);// Route::delete('/tokens/{token_id}', ['uses' => 'AuthorizedAccessTokenController@destroy', 'as' => 'tokens.destroy']);// Route::get('/scopes', ['uses' => 'ScopeController@all', 'as' => 'scopes.index']);-// Route::get('/personal-access-tokens', ['uses' => 'PersonalAccessTokenController@forUser', 'as' => 'personal.tokens.index']);-// Route::post('/personal-access-tokens', ['uses' => 'PersonalAccessTokenController@store', 'as' => 'personal.tokens.store']);-// Route::delete('/personal-access-tokens/{token_id}', ['uses' => 'PersonalAccessTokenController@destroy', 'as' => 'personal.tokens.destroy']);// });// }//);