Fix phpstan issues.

This commit is contained in:
James Cole
2023-10-30 19:49:40 +01:00
parent d36feebb71
commit 4ee3c7d83e
92 changed files with 142 additions and 126 deletions

View File

@@ -250,7 +250,7 @@ class AccountRepository implements AccountRepositoryInterface
static function (Attachment $attachment) use ($disk) {
$notes = $attachment->notes()->first();
$attachment->file_exists = $disk->exists($attachment->fileName());
$attachment->notes = $notes ? $notes->text : '';
$attachment->notes_text = $notes ? $notes->text : '';
return $attachment;
}
@@ -279,7 +279,7 @@ class AccountRepository implements AccountRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -315,7 +315,7 @@ class AccountTasker implements AccountTaskerInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -83,7 +83,7 @@ class OperationsRepository implements OperationsRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -156,7 +156,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -199,7 +199,7 @@ class BillRepository implements BillRepositoryInterface
static function (Attachment $attachment) use ($disk) {
$notes = $attachment->notes()->first();
$attachment->file_exists = $disk->exists($attachment->fileName());
$attachment->notes = $notes ? $notes->text : '';
$attachment->notes_text = $notes ? $notes->text : '';
return $attachment;
}
@@ -344,7 +344,7 @@ class BillRepository implements BillRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -248,8 +248,8 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
$availableBudget = new AvailableBudget();
$availableBudget->user()->associate($this->user);
$availableBudget->transactionCurrency()->associate($currency);
$availableBudget->start_date = $start->format('Y-m-d');
$availableBudget->end_date = $end->format('Y-m-d');
$availableBudget->start_date = $start->startOfDay();
$availableBudget->end_date = $end->endOfDay();
}
$availableBudget->amount = $amount;
$availableBudget->save();
@@ -262,7 +262,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -275,7 +275,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -148,7 +148,7 @@ class BudgetRepository implements BudgetRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}
@@ -589,7 +589,7 @@ class BudgetRepository implements BudgetRepositoryInterface
static function (Attachment $attachment) use ($disk) {
$notes = $attachment->notes()->first();
$attachment->file_exists = $disk->exists($attachment->fileName());
$attachment->notes = $notes ? $notes->text : '';
$attachment->notes_text = $notes ? $notes->text : '';
return $attachment;
}

View File

@@ -143,7 +143,7 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -204,7 +204,7 @@ class OperationsRepository implements OperationsRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -200,7 +200,7 @@ class CategoryRepository implements CategoryRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}
@@ -306,7 +306,7 @@ class CategoryRepository implements CategoryRepositoryInterface
static function (Attachment $attachment) use ($disk) {
$notes = $attachment->notes()->first();
$attachment->file_exists = $disk->exists($attachment->fileName());
$attachment->notes = $notes ? $notes->text : '';
$attachment->notes_text = $notes ? $notes->text : '';
return $attachment;
}

View File

@@ -95,7 +95,7 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -121,7 +121,7 @@ class OperationsRepository implements OperationsRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -76,7 +76,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
{
if ($fromCurrency->id === $toCurrency->id) {
$rate = new CurrencyExchangeRate();
$rate->rate = 1;
$rate->rate = "1";
$rate->id = 0;
return $rate;
@@ -123,7 +123,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -74,7 +74,7 @@ class JournalAPIRepository implements JournalAPIRepositoryInterface
static function (Attachment $attachment) use ($disk) {
$notes = $attachment->notes()->first();
$attachment->file_exists = $disk->exists($attachment->fileName());
$attachment->notes = $notes ? $notes->text : ''; // TODO should not set notes like this.
$attachment->notes_text = $notes ? $notes->text : ''; // TODO should not set notes like this.
return $attachment;
}
@@ -115,7 +115,7 @@ class JournalAPIRepository implements JournalAPIRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -257,7 +257,7 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -209,7 +209,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -155,7 +155,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -125,7 +125,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
static function (Attachment $attachment) use ($disk) {
$notes = $attachment->notes()->first();
$attachment->file_exists = $disk->exists($attachment->fileName());
$attachment->notes = $notes ? $notes->text : ''; // TODO setting the text to the 'notes' field doesn't work.
$attachment->notes_text = $notes ? $notes->text : '';
return $attachment;
}
@@ -278,7 +278,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -349,7 +349,7 @@ class RecurringRepository implements RecurringRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -366,7 +366,7 @@ class RuleRepository implements RuleRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -447,7 +447,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -124,7 +124,7 @@ class OperationsRepository implements OperationsRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -113,7 +113,7 @@ class TagRepository implements TagRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User ) {
$this->user = $user;
}
}

View File

@@ -193,7 +193,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof user) {
$this->user = $user;
}
}

View File

@@ -182,7 +182,7 @@ class UserGroupRepository implements UserGroupRepositoryInterface
public function setUser(Authenticatable | User | null $user): void
{
app('log')->debug(sprintf('Now in %s', __METHOD__));
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}

View File

@@ -27,6 +27,7 @@ namespace FireflyIII\Repositories\UserGroups\Account;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\UserGroup;
use FireflyIII\User;
use Illuminate\Support\Collection;
@@ -35,6 +36,12 @@ use Illuminate\Support\Collection;
*/
interface AccountRepositoryInterface
{
/**
* @param UserGroup $userGroup
*
* @return void
*/
public function setUserGroup(UserGroup $userGroup): void;
/**
* @param User $user

View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\UserGroups\Budget;
use FireflyIII\Models\UserGroup;
use FireflyIII\User;
use Illuminate\Support\Collection;
@@ -39,6 +40,13 @@ interface BudgetRepositoryInterface
* @return void
*/
public function setUser(User $user): void;
/**
* @param UserGroup $userGroup
*
* @return void
*/
public function setUserGroup(UserGroup $userGroup): void;
/**
* @return Collection
*/

View File

@@ -109,7 +109,7 @@ class WebhookRepository implements WebhookRepositoryInterface
*/
public function setUser(User | Authenticatable | null $user): void
{
if (null !== $user) {
if ($user instanceof User) {
$this->user = $user;
}
}