kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +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/Repositories/Budget/OperationsRepository.php
View File

@@ -146,7 +146,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $budgets && $budgets->count() > 0) {
$collector->setBudgets($budgets);
}
if (null === $budgets || (null !== $budgets && 0 === $budgets->count())) {
if (null === $budgets || 0 === $budgets->count()) {
$collector->setBudgets($this->getBudgets());
}
$collector->withBudgetInformation()->withAccountInformation()->withCategoryInformation();

14
app/Repositories/Category/OperationsRepository.php
View File

@@ -63,7 +63,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $categories && $categories->count() > 0) {
$collector->setCategories($categories);
}
if (null === $categories || (null !== $categories && 0 === $categories->count())) {
if (null === $categories || 0 === $categories->count()) {
$collector->setCategories($this->getCategories());
}
$collector->withCategoryInformation()->withAccountInformation()->withBudgetInformation();
@@ -159,7 +159,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $categories && $categories->count() > 0) {
$collector->setCategories($categories);
}
if (null === $categories || (null !== $categories && 0 === $categories->count())) {
if (null === $categories || 0 === $categories->count()) {
$collector->setCategories($this->getCategories());
}
$collector->withCategoryInformation()->withAccountInformation();
@@ -223,7 +223,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $categories && $categories->count() > 0) {
$collector->setCategories($categories);
}
if (null === $categories || (null !== $categories && 0 === $categories->count())) {
if (null === $categories || 0 === $categories->count()) {
$collector->setCategories($this->getCategories());
}
$collector->withCategoryInformation()->withAccountInformation()->withBudgetInformation();
@@ -288,7 +288,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $categories && $categories->count() > 0) {
$collector->setCategories($categories);
}
if (null === $categories || (null !== $categories && 0 === $categories->count())) {
if (null === $categories || 0 === $categories->count()) {
$collector->setCategories($this->getCategories());
}
$collector->withCategoryInformation()->withAccountInformation()->withBudgetInformation();
@@ -361,7 +361,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $accounts && $accounts->count() > 0) {
$collector->setAccounts($accounts);
}
if (null === $categories || (null !== $categories && 0 === $categories->count())) {
if (null === $categories || 0 === $categories->count()) {
$categories = $this->getCategories();
}
$collector->setCategories($categories);
@@ -405,7 +405,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $accounts && $accounts->count() > 0) {
$collector->setAccounts($accounts);
}
if (null === $categories || (null !== $categories && 0 === $categories->count())) {
if (null === $categories || 0 === $categories->count()) {
$categories = $this->getCategories();
}
$collector->setCategories($categories);
@@ -448,7 +448,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $accounts && $accounts->count() > 0) {
$collector->setAccounts($accounts);
}
if (null === $categories || (null !== $categories && 0 === $categories->count())) {
if (null === $categories || 0 === $categories->count()) {
$categories = $this->getCategories();
}
$collector->setCategories($categories);

2
app/Repositories/Journal/JournalRepository.php
View File

@@ -89,7 +89,7 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function firstNull(): ?TransactionJournal
{
/** @var TransactionJournal $entry */
/** @var TransactionJournal|null $entry */
$entry = $this->user->transactionJournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
$result = null;
if (null !== $entry) {

2
app/Repositories/LinkType/LinkTypeRepository.php
View File

@@ -347,7 +347,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
*/
public function switchLinkById(int $linkId): bool
{
/** @var TransactionJournalLink $link */
/** @var TransactionJournalLink|null $link */
$link = TransactionJournalLink::find($linkId);
if (null !== $link && $link->source->user->id === $this->user->id) {
$this->switchLink($link);

7
app/Repositories/PiggyBank/ModifiesPiggyBanks.php
View File

@@ -404,11 +404,8 @@ trait ModifiesPiggyBanks
return $piggyBank;
}
// remove if name is empty. Should be overruled by ID.
if ('' === $objectGroupTitle) {
$piggyBank->objectGroups()->sync([]);
$piggyBank->save();
}
$piggyBank->objectGroups()->sync([]);
$piggyBank->save();
}
// try also with ID:

4
app/Repositories/Tag/OperationsRepository.php
View File

@@ -67,7 +67,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $tags && $tags->count() > 0) {
$collector->setTags($tags);
}
if (null === $tags || (null !== $tags && 0 === $tags->count())) {
if (null === $tags || 0 === $tags->count()) {
$collector->setTags($this->getTags());
}
$collector->withCategoryInformation()->withAccountInformation()->withBudgetInformation()->withTagInformation();
@@ -166,7 +166,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $tags && $tags->count() > 0) {
$collector->setTags($tags);
}
if (null === $tags || (null !== $tags && 0 === $tags->count())) {
if (null === $tags || 0 === $tags->count()) {
$collector->setTags($this->getTags());
}
$collector->withCategoryInformation()->withAccountInformation()->withBudgetInformation()->withTagInformation();

3
app/Repositories/UserGroup/UserGroupRepository.php
View File

@@ -104,7 +104,7 @@ class UserGroupRepository implements UserGroupRepositoryInterface
$memberships = $this->user->groupMemberships()->get();
/** @var GroupMembership $membership */
foreach ($memberships as $membership) {
/** @var UserGroup $group */
/** @var UserGroup|null $group */
$group = $membership->userGroup()->first();
if (null !== $group) {
$collection->push($group);
@@ -131,6 +131,7 @@ class UserGroupRepository implements UserGroupRepositoryInterface
$existingGroup = $this->findByName($groupName);
if (null === $existingGroup) {
$exists = false;
/** @var UserGroup|null $existingGroup */
$existingGroup = $this->store(['user' => $user, 'title' => $groupName]);
}
if (null !== $existingGroup) {