kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-11 07:10:48 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-09-07

Browse Source
This commit is contained in:
JC5
2025-09-07 07:56:10 +02:00
parent 602df95f3c
commit 262f1bae34
93 changed files with 804 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/User/UserRepository.php
View File

@@ -229,7 +229,7 @@ class UserRepository implements UserRepositoryInterface
return $return;
}
public function hasRole(null|Authenticatable|User $user, string $role): bool
public function hasRole(Authenticatable|User|null $user, string $role): bool
{
if (!$user instanceof Authenticatable) {
return false;
@@ -270,7 +270,7 @@ class UserRepository implements UserRepositoryInterface
return $collection;
}
public function inviteUser(null|Authenticatable|User $user, string $email): InvitedUser
public function inviteUser(Authenticatable|User|null $user, string $email): InvitedUser
{
if (!$user instanceof User) {
throw new FireflyException('User is not a User object.');

4
app/Repositories/User/UserRepositoryInterface.php
View File

@@ -105,9 +105,9 @@ interface UserRepositoryInterface
public function getUserGroups(User $user): Collection;
public function hasRole(null|Authenticatable|User $user, string $role): bool;
public function hasRole(Authenticatable|User|null $user, string $role): bool;
public function inviteUser(null|Authenticatable|User $user, string $email): InvitedUser;
public function inviteUser(Authenticatable|User|null $user, string $email): InvitedUser;
public function redeemCode(string $code): void;