IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages 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
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
55 changed files with 242 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
View File

@ -45,6 +45,7 @@ class RecurrenceController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(RecurringRepositoryInterface::class); $this->repository = app(RecurringRepositoryInterface::class);
$this->repository->setUser(auth()->user()); $this->repository->setUser(auth()->user());
return $next($request); return $next($request);

7
app/Repositories/Account/AccountRepository.php
View File

@ -38,6 +38,7 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Services\Internal\Destroy\AccountDestroyService; use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
use FireflyIII\Services\Internal\Update\AccountUpdateService; use FireflyIII\Services\Internal\Update\AccountUpdateService;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@ -273,12 +274,14 @@ class AccountRepository implements AccountRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @inheritDoc * @inheritDoc

5
app/Repositories/Account/AccountRepositoryInterface.php
View File

@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -302,9 +303,9 @@ interface AccountRepositoryInterface
public function searchAccountNr(string $query, array $types, int $limit): Collection; public function searchAccountNr(string $query, array $types, int $limit): Collection;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

7
app/Repositories/Account/AccountTasker.php
View File

@ -30,6 +30,7 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use JsonException; use JsonException;
use Log; use Log;
@ -309,10 +310,12 @@ class AccountTasker implements AccountTaskerInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
} }
}

5
app/Repositories/Account/AccountTaskerInterface.php
View File

@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Account;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -60,7 +61,7 @@ interface AccountTaskerInterface
public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): array; public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): array;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
} }

7
app/Repositories/Account/OperationsRepository.php
View File

@ -28,6 +28,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -78,12 +79,14 @@ class OperationsRepository implements OperationsRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param array $journals * @param array $journals

5
app/Repositories/Account/OperationsRepositoryInterface.php
View File

@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Account;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -60,9 +61,9 @@ interface OperationsRepositoryInterface
public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* Sum of withdrawal journals in period for a set of accounts, grouped per currency. Amounts are always negative. * Sum of withdrawal journals in period for a set of accounts, grouped per currency. Amounts are always negative.

7
app/Repositories/Attachment/AttachmentRepository.php
View File

@ -31,6 +31,7 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Models\Attachment; use FireflyIII\Models\Attachment;
use FireflyIII\Models\Note; use FireflyIII\Models\Note;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
@ -152,12 +153,14 @@ class AttachmentRepository implements AttachmentRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param Attachment $attachment * @param Attachment $attachment

5
app/Repositories/Attachment/AttachmentRepositoryInterface.php
View File

@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Attachment;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Attachment; use FireflyIII\Models\Attachment;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -69,9 +70,9 @@ interface AttachmentRepositoryInterface
public function getNoteText(Attachment $attachment): ?string; public function getNoteText(Attachment $attachment): ?string;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

7
app/Repositories/Bill/BillRepository.php
View File

@ -39,6 +39,7 @@ use FireflyIII\Services\Internal\Destroy\BillDestroyService;
use FireflyIII\Services\Internal\Update\BillUpdateService; use FireflyIII\Services\Internal\Update\BillUpdateService;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@ -198,12 +199,14 @@ class BillRepository implements BillRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* Correct order of piggies in case of issues. * Correct order of piggies in case of issues.

5
app/Repositories/Bill/BillRepositoryInterface.php
View File

@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@ -315,9 +316,9 @@ interface BillRepositoryInterface
public function setOrder(Bill $bill, int $order): void; public function setOrder(Bill $bill, int $order): void;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

7
app/Repositories/Budget/AvailableBudgetRepository.php
View File

@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\AvailableBudget;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@ -220,12 +221,14 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param array $data * @param array $data

5
app/Repositories/Budget/AvailableBudgetRepositoryInterface.php
View File

@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\AvailableBudget;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -133,9 +134,9 @@ interface AvailableBudgetRepositoryInterface
public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget; public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

7
app/Repositories/Budget/BudgetLimitRepository.php
View File

@ -30,6 +30,7 @@ use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use JsonException; use JsonException;
@ -271,12 +272,14 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param array $data * @param array $data

5
app/Repositories/Budget/BudgetLimitRepositoryInterface.php
View File

@ -28,6 +28,7 @@ use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -99,9 +100,9 @@ interface BudgetLimitRepositoryInterface
public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection; public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

7
app/Repositories/Budget/BudgetRepository.php
View File

@ -41,6 +41,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Services\Internal\Destroy\BudgetDestroyService; use FireflyIII\Services\Internal\Destroy\BudgetDestroyService;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use JsonException; use JsonException;
@ -144,12 +145,14 @@ class BudgetRepository implements BudgetRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @return Collection * @return Collection

5
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\AutoBudget; use FireflyIII\Models\AutoBudget;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -191,9 +192,9 @@ interface BudgetRepositoryInterface
public function setBudgetOrder(Budget $budget, int $order): void; public function setBudgetOrder(Budget $budget, int $order): void;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* Used in the v2 API to calculate the amount of money spent in all active budgets. * Used in the v2 API to calculate the amount of money spent in all active budgets.

7
app/Repositories/Budget/NoBudgetRepository.php
View File

@ -28,6 +28,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -138,12 +139,14 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* TODO this method does not include multi currency. It just counts. * TODO this method does not include multi currency. It just counts.

5
app/Repositories/Budget/NoBudgetRepositoryInterface.php
View File

@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Budget;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -44,9 +45,9 @@ interface NoBudgetRepositoryInterface
public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array; public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param Collection $accounts * @param Collection $accounts

7
app/Repositories/Budget/OperationsRepository.php
View File

@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
@ -200,12 +201,14 @@ class OperationsRepository implements OperationsRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @return Collection * @return Collection

5
app/Repositories/Budget/OperationsRepositoryInterface.php
View File

@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -70,9 +71,9 @@ interface OperationsRepositoryInterface
public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null): array; public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null): array;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**

8
app/Repositories/Category/CategoryRepository.php
View File

@ -36,6 +36,7 @@ use FireflyIII\Models\RuleAction;
use FireflyIII\Services\Internal\Destroy\CategoryDestroyService; use FireflyIII\Services\Internal\Destroy\CategoryDestroyService;
use FireflyIII\Services\Internal\Update\CategoryUpdateService; use FireflyIII\Services\Internal\Update\CategoryUpdateService;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Storage; use Storage;
@ -196,13 +197,14 @@ class CategoryRepository implements CategoryRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param Category $category * @param Category $category
*/ */

5
app/Repositories/Category/CategoryRepositoryInterface.php
View File

@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -151,9 +152,9 @@ interface CategoryRepositoryInterface
public function searchCategory(string $query, int $limit): Collection; public function searchCategory(string $query, int $limit): Collection;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

7
app/Repositories/Category/NoCategoryRepository.php
View File

@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -90,12 +91,14 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* This method returns a list of all the deposit transaction journals (as arrays) set in that period * This method returns a list of all the deposit transaction journals (as arrays) set in that period

5
app/Repositories/Category/NoCategoryRepositoryInterface.php
View File

@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Category;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -60,9 +61,9 @@ interface NoCategoryRepositoryInterface
public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* Sum of withdrawal journals in period without a category, grouped per currency. Amounts are always negative. * Sum of withdrawal journals in period without a category, grouped per currency. Amounts are always negative.

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

@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -116,12 +117,14 @@ class OperationsRepository implements OperationsRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* Returns a list of all the categories belonging to a user. * Returns a list of all the categories belonging to a user.

5
app/Repositories/Category/OperationsRepositoryInterface.php
View File

@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Category;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -92,9 +93,9 @@ interface OperationsRepositoryInterface
public function listTransferredOut(Carbon $start, Carbon $end, Collection $accounts, ?Collection $categories = null): array; public function listTransferredOut(Carbon $start, Carbon $end, Collection $accounts, ?Collection $categories = null): array;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* Sum of withdrawal journals in period for a set of categories, grouped per currency. Amounts are always negative. * Sum of withdrawal journals in period for a set of categories, grouped per currency. Amounts are always negative.

7
app/Repositories/Currency/CurrencyRepository.php
View File

@ -39,6 +39,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Services\Internal\Destroy\CurrencyDestroyService; use FireflyIII\Services\Internal\Destroy\CurrencyDestroyService;
use FireflyIII\Services\Internal\Update\CurrencyUpdateService; use FireflyIII\Services\Internal\Update\CurrencyUpdateService;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use JsonException; use JsonException;
use Log; use Log;
@ -487,12 +488,14 @@ class CurrencyRepository implements CurrencyRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param array $data * @param array $data

5
app/Repositories/Currency/CurrencyRepositoryInterface.php
View File

@ -29,6 +29,7 @@ use FireflyIII\Models\CurrencyExchangeRate;
use FireflyIII\Models\Preference; use FireflyIII\Models\Preference;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -229,9 +230,9 @@ interface CurrencyRepositoryInterface
public function setExchangeRate(TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date, float $rate): CurrencyExchangeRate; public function setExchangeRate(TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date, float $rate): CurrencyExchangeRate;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

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

@ -28,6 +28,7 @@ use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Storage; 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
{ {
if(null !== $user) {
$this->user = $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\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -70,7 +71,7 @@ interface JournalAPIRepositoryInterface
public function getPiggyBankEvents(TransactionJournal $journal): Collection; 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\Models\TransactionJournal;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use stdClass; 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 Carbon\Carbon;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -114,7 +115,7 @@ interface JournalCLIRepositoryInterface
public function getTags(TransactionJournal $journal): array; 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;
} }

7
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\Services\Internal\Update\JournalUpdateService;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -252,12 +253,14 @@ 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
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* Update budget for a journal. * Update budget for a journal.

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

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

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

@ -30,6 +30,7 @@ use FireflyIII\Models\Note;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionJournalLink; use FireflyIII\Models\TransactionJournalLink;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
@ -199,12 +200,14 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param array $data * @param array $data

7
app/Repositories/LinkType/LinkTypeRepositoryInterface.php
View File

@ -27,6 +27,7 @@ use FireflyIII\Models\LinkType;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionJournalLink; use FireflyIII\Models\TransactionJournalLink;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -124,11 +125,9 @@ interface LinkTypeRepositoryInterface
public function getLinks(TransactionJournal $journal): Collection; public function getLinks(TransactionJournal $journal): Collection;
/** /**
* Set the user for this instance. * @param User|Authenticatable|null $user
*
* @param User $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

7
app/Repositories/ObjectGroup/ObjectGroupRepository.php
View File

@ -28,6 +28,7 @@ use DB;
use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\ObjectGroup;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
@ -151,12 +152,14 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if (null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @inheritDoc * @inheritDoc

5
app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php
View File

@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\ObjectGroup;
use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\ObjectGroup;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -89,9 +90,9 @@ interface ObjectGroupRepositoryInterface
public function setOrder(ObjectGroup $objectGroup, int $newOrder): ObjectGroup; public function setOrder(ObjectGroup $objectGroup, int $newOrder): ObjectGroup;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param ObjectGroup $objectGroup * @param ObjectGroup $objectGroup

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

@ -34,6 +34,7 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use JsonException; use JsonException;
use Log; use Log;
@ -274,12 +275,14 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @return int * @return int

5
app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
View File

@ -29,6 +29,7 @@ use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankRepetition; use FireflyIII\Models\PiggyBankRepetition;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -253,9 +254,9 @@ interface PiggyBankRepositoryInterface
public function setOrder(PiggyBank $piggyBank, int $newOrder): bool; public function setOrder(PiggyBank $piggyBank, int $newOrder): bool;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* Store new piggy bank. * Store new piggy bank.

9
app/Repositories/Recurring/RecurringRepository.php
View File

@ -43,6 +43,7 @@ use FireflyIII\Support\Repositories\Recurring\CalculateXOccurrences;
use FireflyIII\Support\Repositories\Recurring\CalculateXOccurrencesSince; use FireflyIII\Support\Repositories\Recurring\CalculateXOccurrencesSince;
use FireflyIII\Support\Repositories\Recurring\FiltersWeekends; use FireflyIII\Support\Repositories\Recurring\FiltersWeekends;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@ -345,14 +346,14 @@ class RecurringRepository implements RecurringRepositoryInterface
} }
/** /**
* Set user for in repository. * @param User|Authenticatable|null $user
*
* @param User $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param Recurrence $recurrence * @param Recurrence $recurrence

7
app/Repositories/Recurring/RecurringRepositoryInterface.php
View File

@ -29,6 +29,7 @@ use FireflyIII\Models\Recurrence;
use FireflyIII\Models\RecurrenceRepetition; use FireflyIII\Models\RecurrenceRepetition;
use FireflyIII\Models\RecurrenceTransaction; use FireflyIII\Models\RecurrenceTransaction;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@ -226,11 +227,9 @@ interface RecurringRepositoryInterface
public function searchRecurrence(string $query, int $limit): Collection; public function searchRecurrence(string $query, int $limit): Collection;
/** /**
* Set user for in repository. * @param User|Authenticatable|null $user
*
* @param User $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* Store a new recurring transaction. * Store a new recurring transaction.

7
app/Repositories/Rule/RuleRepository.php
View File

@ -32,6 +32,7 @@ use FireflyIII\Models\RuleTrigger;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Support\Search\OperatorQuerySearch; use FireflyIII\Support\Search\OperatorQuerySearch;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
@ -361,12 +362,14 @@ class RuleRepository implements RuleRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @inheritDoc * @inheritDoc

5
app/Repositories/Rule/RuleRepositoryInterface.php
View File

@ -28,6 +28,7 @@ use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\RuleTrigger;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -162,9 +163,9 @@ interface RuleRepositoryInterface
public function setOrder(Rule $rule, int $newOrder): void; public function setOrder(Rule $rule, int $newOrder): void;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

7
app/Repositories/RuleGroup/RuleGroupRepository.php
View File

@ -29,6 +29,7 @@ use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\RuleTrigger;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
@ -443,12 +444,14 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param array $data * @param array $data

5
app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
View File

@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\RuleGroup;
use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleGroup;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -164,9 +165,9 @@ interface RuleGroupRepositoryInterface
public function setOrder(RuleGroup $ruleGroup, int $newOrder): void; public function setOrder(RuleGroup $ruleGroup, int $newOrder): void;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data

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

@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;
@ -117,12 +118,14 @@ class OperationsRepository implements OperationsRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @return Collection * @return Collection

5
app/Repositories/Tag/OperationsRepositoryInterface.php
View File

@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Tag;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -63,9 +64,9 @@ interface OperationsRepositoryInterface
public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $tags = null): array; public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $tags = null): array;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* Sum of withdrawal journals in period for a set of tags, grouped per currency. Amounts are always negative. * Sum of withdrawal journals in period for a set of tags, grouped per currency. Amounts are always negative.

7
app/Repositories/Tag/TagRepository.php
View File

@ -34,6 +34,7 @@ use FireflyIII\Models\Note;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Storage; use Storage;
@ -109,12 +110,14 @@ class TagRepository implements TagRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @param int $tagId * @param int $tagId

5
app/Repositories/Tag/TagRepositoryInterface.php
View File

@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Models\Location; use FireflyIII\Models\Location;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -163,9 +164,9 @@ interface TagRepositoryInterface
public function searchTags(string $query, int $limit): Collection; public function searchTags(string $query, int $limit): Collection;
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user); public function setUser(User|Authenticatable|null $user): void;
/** /**
* This method stores a tag. * This method stores a tag.

7
app/Repositories/TransactionGroup/TransactionGroupRepository.php
View File

@ -45,6 +45,7 @@ use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService;
use FireflyIII\Services\Internal\Update\GroupUpdateService; use FireflyIII\Services\Internal\Update\GroupUpdateService;
use FireflyIII\Support\NullArrayObject; use FireflyIII\Support\NullArrayObject;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use JsonException; use JsonException;
@ -189,12 +190,14 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
} }
/** /**
* @param User $user * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* Get the note text for a journal (by ID). * Get the note text for a journal (by ID).

7
app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php
View File

@ -29,6 +29,7 @@ use FireflyIII\Models\Location;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
use FireflyIII\Support\NullArrayObject; use FireflyIII\Support\NullArrayObject;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -150,11 +151,9 @@ interface TransactionGroupRepositoryInterface
public function getTags(int $journalId): array; public function getTags(int $journalId): array;
/** /**
* Set the user. * @param User|Authenticatable|null $user
*
* @param User $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* Create a new transaction group. * Create a new transaction group.

7
app/Repositories/Webhook/WebhookRepository.php
View File

@ -27,6 +27,7 @@ use FireflyIII\Models\Webhook;
use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookAttempt;
use FireflyIII\Models\WebhookMessage; use FireflyIII\Models\WebhookMessage;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Str; use Str;
@ -104,12 +105,14 @@ class WebhookRepository implements WebhookRepositoryInterface
} }
/** /**
* @inheritDoc * @param User|Authenticatable|null $user
*/ */
public function setUser(User $user): void public function setUser(User|Authenticatable|null $user): void
{ {
if(null !== $user) {
$this->user = $user; $this->user = $user;
} }
}
/** /**
* @inheritDoc * @inheritDoc

7
app/Repositories/Webhook/WebhookRepositoryInterface.php
View File

@ -27,6 +27,7 @@ use FireflyIII\Models\Webhook;
use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookAttempt;
use FireflyIII\Models\WebhookMessage; use FireflyIII\Models\WebhookMessage;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -78,11 +79,9 @@ interface WebhookRepositoryInterface
public function getReadyMessages(Webhook $webhook): Collection; public function getReadyMessages(Webhook $webhook): Collection;
/** /**
* Set user. * @param User|Authenticatable|null $user
*
* @param User $user
*/ */
public function setUser(User $user): void; public function setUser(User|Authenticatable|null $user): void;
/** /**
* @param array $data * @param array $data