kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix phpstan issues.

Browse Source
This commit is contained in:
James Cole
2024-04-23 19:40:48 +02:00
parent f43aadf02d
commit fa3ccbda33
18 changed files with 61 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Api/V2/Controllers/Autocomplete/AccountController.php
View File

@@ -55,11 +55,7 @@ class AccountController extends Controller
function ($request, $next) { function ($request, $next) {
$this->repository = app(AccountRepositoryInterface::class); $this->repository = app(AccountRepositoryInterface::class);
$this->adminRepository = app(AdminAccountRepositoryInterface::class); $this->adminRepository = app(AdminAccountRepositoryInterface::class);
$this->adminRepository->setUserGroup($this->validateUserGroup($request));
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->adminRepository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

6
app/Api/V2/Controllers/Autocomplete/CategoryController.php
View File

@@ -45,11 +45,7 @@ class CategoryController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(CategoryRepositoryInterface::class); $this->repository = app(CategoryRepositoryInterface::class);
$this->repository->setUserGroup($this->validateUserGroup($request));
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

6
app/Api/V2/Controllers/Autocomplete/TagController.php
View File

@@ -45,11 +45,7 @@ class TagController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(TagRepositoryInterface::class); $this->repository = app(TagRepositoryInterface::class);
$this->repository->setUserGroup($this->validateUserGroup($request));
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

6
app/Api/V2/Controllers/Autocomplete/TransactionController.php
View File

@@ -45,11 +45,7 @@ class TransactionController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(JournalRepositoryInterface::class); $this->repository = app(JournalRepositoryInterface::class);
$this->repository->setUserGroup($this->validateUserGroup($request));
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

3
app/Api/V2/Controllers/Chart/AccountController.php
View File

@@ -55,8 +55,7 @@ class AccountController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(AccountRepositoryInterface::class); $this->repository = app(AccountRepositoryInterface::class);
$userGroup = $this->validateUserGroup($request); $this->repository->setUserGroup($this->validateUserGroup($request));
$this->repository->setUserGroup($userGroup);
return $next($request); return $next($request);
} }

3
app/Api/V2/Controllers/Chart/BudgetController.php
View File

@@ -64,12 +64,9 @@ class BudgetController extends Controller
$this->blRepository = app(BudgetLimitRepositoryInterface::class); $this->blRepository = app(BudgetLimitRepositoryInterface::class);
$this->opsRepository = app(OperationsRepositoryInterface::class); $this->opsRepository = app(OperationsRepositoryInterface::class);
$this->currency = app('amount')->getDefaultCurrency(); $this->currency = app('amount')->getDefaultCurrency();
$userGroup = $this->validateUserGroup($request); $userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup); $this->repository->setUserGroup($userGroup);
$this->opsRepository->setUserGroup($userGroup); $this->opsRepository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

5
app/Api/V2/Controllers/Chart/CategoryController.php
View File

@@ -57,10 +57,7 @@ class CategoryController extends Controller
function ($request, $next) { function ($request, $next) {
$this->accountRepos = app(AccountRepositoryInterface::class); $this->accountRepos = app(AccountRepositoryInterface::class);
$this->currencyRepos = app(CurrencyRepositoryInterface::class); $this->currencyRepos = app(CurrencyRepositoryInterface::class);
$userGroup = $this->validateUserGroup($request); $this->accountRepos->setUserGroup($this->validateUserGroup($request));
if (null !== $userGroup) {
$this->accountRepos->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

9
app/Api/V2/Controllers/Model/Account/UpdateController.php
View File

@@ -45,11 +45,7 @@ class UpdateController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(AccountRepositoryInterface::class); $this->repository = app(AccountRepositoryInterface::class);
// new way of user group validation $this->repository->setUserGroup($this->validateUserGroup($request));
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }
@@ -73,7 +69,6 @@ class UpdateController extends Controller
return response() return response()
->api($this->jsonApiObject('accounts', $account, $transformer)) ->api($this->jsonApiObject('accounts', $account, $transformer))
->header('Content-Type', self::CONTENT_TYPE) ->header('Content-Type', self::CONTENT_TYPE);
;
} }
} }

7
app/Api/V2/Controllers/Model/Bill/IndexController.php
View File

@@ -46,12 +46,7 @@ class IndexController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(BillRepositoryInterface::class); $this->repository = app(BillRepositoryInterface::class);
$this->repository->setUserGroup($this->validateUserGroup($request));
// new way of user group validation
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

7
app/Api/V2/Controllers/Model/Bill/ShowController.php
View File

@@ -46,12 +46,7 @@ class ShowController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(BillRepositoryInterface::class); $this->repository = app(BillRepositoryInterface::class);
$this->repository->setUserGroup($this->validateUserGroup($request));
// new way of user group validation
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

6
app/Api/V2/Controllers/Model/Bill/SumController.php
View File

@@ -45,11 +45,7 @@ class SumController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(BillRepositoryInterface::class); $this->repository = app(BillRepositoryInterface::class);
$this->repository->setUserGroup($this->validateUserGroup($request));
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

6
app/Api/V2/Controllers/Model/PiggyBank/IndexController.php
View File

@@ -46,11 +46,7 @@ class IndexController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(PiggyBankRepositoryInterface::class); $this->repository = app(PiggyBankRepositoryInterface::class);
$this->repository->setUserGroup($this->validateUserGroup($request));
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

2
app/Api/V2/Controllers/Summary/NetWorthController.php
View File

@@ -52,10 +52,8 @@ class NetWorthController extends Controller
$this->repository = app(AccountRepositoryInterface::class); $this->repository = app(AccountRepositoryInterface::class);
// new way of user group validation // new way of user group validation
$userGroup = $this->validateUserGroup($request); $userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->netWorth->setUserGroup($userGroup); $this->netWorth->setUserGroup($userGroup);
$this->repository->setUserGroup($userGroup); $this->repository->setUserGroup($userGroup);
}
return $next($request); return $next($request);
} }

2
app/Http/Controllers/HomeController.php
View File

@@ -151,8 +151,8 @@ class HomeController extends Controller
} }
/** @var Carbon $start */ /** @var Carbon $start */
/** @var Carbon $end */
$start = session('start', today(config('app.timezone'))->startOfMonth()); $start = session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */
$end = session('end', today(config('app.timezone'))->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
$accounts = $repository->getAccountsById($frontpageArray); $accounts = $repository->getAccountsById($frontpageArray);
$today = today(config('app.timezone')); $today = today(config('app.timezone'));

4
app/Jobs/MailError.php
View File

@@ -130,12 +130,12 @@ class MailError extends Job implements ShouldQueue
} }
if (file_exists($file)) { if (file_exists($file)) {
Log::debug(sprintf('Read file in "%s"', $file)); Log::debug(sprintf('Read file in "%s"', $file));
$limits = json_decode(file_get_contents($file), true); $limits = json_decode((string)file_get_contents($file), true);
} }
// limit reached? // limit reached?
foreach ($types as $type => $info) { foreach ($types as $type => $info) {
Log::debug(sprintf('Now checking limit "%s"', $type), $info); Log::debug(sprintf('Now checking limit "%s"', $type), $info);
if (!isset($limits[$type])) { if (!array_key_exists($type, $limits)) {
Log::debug(sprintf('Limit "%s" reset to zero, did not exist yet.', $type)); Log::debug(sprintf('Limit "%s" reset to zero, did not exist yet.', $type));
$limits[$type] = [ $limits[$type] = [
'time' => time(), 'time' => time(),

2
app/Support/Http/Api/ValidatesUserGroupTrait.php
View File

@@ -81,7 +81,7 @@ trait ValidatesUserGroupTrait
throw new AuthorizationException((string) trans('validation.belongs_user_or_user_group')); throw new AuthorizationException((string) trans('validation.belongs_user_or_user_group'));
} }
Log::debug(sprintf('validateUserGroup: validate access of user to group #%d ("%s").', $groupId, $group->title)); Log::debug(sprintf('validateUserGroup: validate access of user to group #%d ("%s").', $groupId, $group->title));
$roles = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : []; $roles = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : []; // @phpstan-ignore-line
if (0 === count($roles)) { if (0 === count($roles)) {
Log::debug('validateUserGroup: no roles defined, so no access.'); Log::debug('validateUserGroup: no roles defined, so no access.');

2
app/Support/Request/ConvertsDataTypes.php
View File

@@ -159,10 +159,8 @@ trait ConvertsDataTypes
if (method_exists($this, 'validateUserGroup')) { // @phpstan-ignore-line if (method_exists($this, 'validateUserGroup')) { // @phpstan-ignore-line
$userGroup = $this->validateUserGroup($this); $userGroup = $this->validateUserGroup($this);
if (null !== $userGroup) {
$repository->setUserGroup($userGroup); $repository->setUserGroup($userGroup);
} }
}
// set administration ID // set administration ID
// group ID // group ID

2
config/debugbar.php
View File

@@ -62,7 +62,7 @@ return [
| |
*/ */
'editor' => env('DEBUGBAR_EDITOR') ?: env('IGNITION_EDITOR', 'phpstorm'), 'editor' => env('DEBUGBAR_EDITOR') ?? env('IGNITION_EDITOR', 'phpstorm'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------