kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix phpstan issues.

Browse Source
This commit is contained in:
James Cole
2023-11-05 16:55:16 +01:00
parent 4edd9fe3da
commit a0564751d6
72 changed files with 110 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Account/CreateController.php
View File

@@ -158,7 +158,7 @@ class CreateController extends Controller
}
// store attachment(s):
/** @var array $files */
/** @var array|null $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachments->saveAttachmentsForModel($account, $files);

2
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -79,7 +79,7 @@ class ForgotPasswordController extends Controller
$this->validateEmail($request);
// verify if the user is not a demo user. If so, we give him back an error.
/** @var User $user */
/** @var User|null $user */
$user = User::where('email', $request->get('email'))->first();
if (null !== $user && $repository->hasRole($user, 'demo')) {

2
app/Http/Controllers/Auth/LoginController.php
View File

@@ -97,7 +97,7 @@ class LoginController extends Controller
// If the class is using the ThrottlesLogins trait, we can automatically throttle
// the login attempts for this application. We'll key this by the username and
// the IP address of the client making these requests into this application.
if (method_exists($this, 'hasTooManyLoginAttempts') && $this->hasTooManyLoginAttempts($request)) {
if ($this->hasTooManyLoginAttempts($request)) {
Log::channel('audit')->info(sprintf('Login for user "%s" was locked out.', $request->get($this->username())));
app('log')->error(sprintf('Login for user "%s" was locked out.', $request->get($this->username())));
$this->fireLockoutEvent($request);

2
app/Http/Controllers/Bill/CreateController.php
View File

@@ -114,7 +114,7 @@ class CreateController extends Controller
$request->session()->flash('success', (string)trans('firefly.stored_new_bill', ['name' => $bill->name]));
app('preferences')->mark();
/** @var array $files */
/** @var array|null $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachments->saveAttachmentsForModel($bill, $files);

2
app/Http/Controllers/Bill/EditController.php
View File

@@ -128,7 +128,7 @@ class EditController extends Controller
$request->session()->flash('success', (string)trans('firefly.updated_bill', ['name' => $bill->name]));
app('preferences')->mark();
/** @var array $files */
/** @var array|null $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachments->saveAttachmentsForModel($bill, $files);

6
app/Http/Controllers/Bill/ShowController.php
View File

@@ -90,11 +90,7 @@ class ShowController extends Controller
return redirect(route('bills.show', [$bill->id]));
}
$set = new Collection();
if (true === $bill->active) {
$set = $this->repository->getRulesForBill($bill);
$total = 0;
}
$set = $this->repository->getRulesForBill($bill);
if (0 === $set->count()) {
$request->session()->flash('error', (string)trans('firefly.no_rules_for_bill'));

2
app/Http/Controllers/PiggyBank/CreateController.php
View File

@@ -103,7 +103,7 @@ class CreateController extends Controller
app('preferences')->mark();
// store attachment(s):
/** @var array $files */
/** @var array|null $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachments->saveAttachmentsForModel($piggyBank, $files);

2
app/Http/Controllers/PiggyBank/EditController.php
View File

@@ -127,7 +127,7 @@ class EditController extends Controller
app('preferences')->mark();
// store new attachment(s):
/** @var array $files */
/** @var array|null $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachments->saveAttachmentsForModel($piggyBank, $files);

2
app/Http/Controllers/Recurring/CreateController.php
View File

@@ -241,7 +241,7 @@ class CreateController extends Controller
app('preferences')->mark();
// store attachment(s):
/** @var array $files */
/** @var array|null $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachments->saveAttachmentsForModel($recurrence, $files);

4
app/Http/Controllers/TagController.php
View File

@@ -327,7 +327,7 @@ class TagController extends Controller
app('preferences')->mark();
// store attachment(s):
/** @var array $files */
/** @var array|null $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachmentsHelper->saveAttachmentsForModel($result, $files);
@@ -366,7 +366,7 @@ class TagController extends Controller
app('preferences')->mark();
// store new attachment(s):
/** @var array $files */
/** @var array|null $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachmentsHelper->saveAttachmentsForModel($tag, $files);

2
app/Http/Controllers/Transaction/MassController.php
View File

@@ -106,7 +106,7 @@ class MassController extends Controller
/** @var string $journalId */
foreach ($ids as $journalId) {
app('log')->debug(sprintf('Searching for ID #%d', $journalId));
/** @var TransactionJournal $journal */
/** @var TransactionJournal|null $journal */
$journal = $this->repository->find((int)$journalId);
if (null !== $journal && (int)$journalId === (int)$journal->id) {
$this->repository->destroyJournal($journal);

2
app/Http/Requests/AccountFormRequest.php
View File

@@ -122,7 +122,7 @@ class AccountFormRequest extends FormRequest
];
$rules = Location::requestRules($rules);
/** @var Account $account */
/** @var Account|null $account */
$account = $this->route()->parameter('account');
if (null !== $account) {
// add rules:

2
app/Http/Requests/BudgetFormUpdateRequest.php
View File

@@ -65,7 +65,7 @@ class BudgetFormUpdateRequest extends FormRequest
{
$nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name';
/** @var Budget $budget */
/** @var Budget|null $budget */
$budget = $this->route()->parameter('budget');
if (null !== $budget) {

2
app/Http/Requests/CategoryFormRequest.php
View File

@@ -57,7 +57,7 @@ class CategoryFormRequest extends FormRequest
public function rules(): array
{
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name';
/** @var Category $category */
/** @var Category|null $category */
$category = $this->route()->parameter('category');
if (null !== $category) {

2
app/Http/Requests/CurrencyFormRequest.php
View File

@@ -68,7 +68,7 @@ class CurrencyFormRequest extends FormRequest
'enabled' => 'in:0,1',
];
/** @var TransactionCurrency $currency */
/** @var TransactionCurrency|null $currency */
$currency = $this->route()->parameter('currency');
if (null !== $currency) {

2
app/Http/Requests/ObjectGroupFormRequest.php
View File

@@ -55,7 +55,7 @@ class ObjectGroupFormRequest extends FormRequest
*/
public function rules(): array
{
/** @var ObjectGroup $objectGroup */
/** @var ObjectGroup|null $objectGroup */
$objectGroup = $this->route()->parameter('objectGroup');
$titleRule = 'required|between:1,255|uniqueObjectGroup';

2
app/Http/Requests/RecurrenceFormRequest.php
View File

@@ -259,7 +259,7 @@ class RecurrenceFormRequest extends FormRequest
}
// update some rules in case the user is editing a post:
/** @var Recurrence $recurrence */
/** @var Recurrence|null $recurrence */
$recurrence = $this->route()->parameter('recurrence');
if ($recurrence instanceof Recurrence) {
$rules['id'] = 'required|numeric|exists:recurrences,id';

2
app/Http/Requests/RuleFormRequest.php
View File

@@ -164,7 +164,7 @@ class RuleFormRequest extends FormRequest
'strict' => 'in:0,1',
];
/** @var Rule $rule */
/** @var Rule|null $rule */
$rule = $this->route()->parameter('rule');
if (null !== $rule) {

2
app/Http/Requests/RuleGroupFormRequest.php
View File

@@ -65,7 +65,7 @@ class RuleGroupFormRequest extends FormRequest
{
$titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title';
/** @var RuleGroup $ruleGroup */
/** @var RuleGroup|null $ruleGroup */
$ruleGroup = $this->route()->parameter('ruleGroup');
if (null !== $ruleGroup) {

2
app/Http/Requests/TagFormRequest.php
View File

@@ -64,7 +64,7 @@ class TagFormRequest extends FormRequest
{
$idRule = '';
/** @var Tag $tag */
/** @var Tag|null $tag */
$tag = $this->route()->parameter('tag');
$tagRule = 'required|max:1024|min:1|uniqueObjectForUser:tags,tag';
if (null !== $tag) {