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

Add different setUser call.

Browse Source
This commit is contained in:
James Cole
2023-02-19 08:43:28 +01:00
parent 94ae0bd7c3
commit 1b06211152
55 changed files with 242 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Repositories/Journal/JournalAPIRepository.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection;
use Storage;
@@ -110,10 +111,12 @@ class JournalAPIRepository implements JournalAPIRepositoryInterface
}
/**
* @param User $user
* @param User|Authenticatable|null $user
*/
public function setUser(User $user): void
public function setUser(User|Authenticatable|null $user): void
{
$this->user = $user;
if(null !== $user) {
$this->user = $user;
}
}
}

5
app/Repositories/Journal/JournalAPIRepositoryInterface.php
View File

@@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Journal;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection;
/**
@@ -70,7 +71,7 @@ interface JournalAPIRepositoryInterface
public function getPiggyBankEvents(TransactionJournal $journal): Collection;
/**
* @param User $user
* @param User|Authenticatable|null $user
*/
public function setUser(User $user);
public function setUser(User|Authenticatable|null $user): void;
}

7
app/Repositories/Journal/JournalCLIRepository.php
View File

@@ -28,6 +28,7 @@ use DB;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\CacheProperties;
use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection;
use stdClass;
@@ -227,10 +228,10 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface
}
/**
* @param User $user
* @param User|Authenticatable|null $user
*/
public function setUser(User $user): void
public function setUser(User|Authenticatable|null $user): void
{
return;
// empty
}
}

5
app/Repositories/Journal/JournalCLIRepositoryInterface.php
View File

@@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Journal;
use Carbon\Carbon;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection;
/**
@@ -114,7 +115,7 @@ interface JournalCLIRepositoryInterface
public function getTags(TransactionJournal $journal): array;
/**
* @param User $user
* @param User|Authenticatable|null $user
*/
public function setUser(User $user);
public function setUser(User|Authenticatable|null $user): void;
}

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

@@ -37,6 +37,7 @@ use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService;
use FireflyIII\Services\Internal\Update\JournalUpdateService;
use FireflyIII\Support\CacheProperties;
use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection;
/**
@@ -252,11 +253,13 @@ class JournalRepository implements JournalRepositoryInterface
}
/**
* @param User $user
* @param User|Authenticatable|null $user
*/
public function setUser(User $user): void
public function setUser(User|Authenticatable|null $user): void
{
$this->user = $user;
if(null !== $user) {
$this->user = $user;
}
}
/**

5
app/Repositories/Journal/JournalRepositoryInterface.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionJournalLink;
use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection;
/**
@@ -143,9 +144,9 @@ interface JournalRepositoryInterface
public function searchJournalDescriptions(string $search, int $limit): Collection;
/**
* @param User $user
* @param User|Authenticatable|null $user
*/
public function setUser(User $user);
public function setUser(User|Authenticatable|null $user): void;
/**
* Update budget for a journal.