Skip to content

Commit f908f4c

Browse files
committed
Merge branch 'master' into 8.x
2 parents c8c4946 + 0077a65 commit f908f4c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/Checkers/User/UserDefaultChecker.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ protected function userCachedRoles(): array
153153
$cacheKey = 'laratrust_roles_for_'.$this->userModelCacheKey().'_'.$this->user->getKey();
154154

155155
if (! Config::get('laratrust.cache.enabled')) {
156-
return $this->user->roles()->get()->toArray();
156+
return $this->user->getRelationValue('roles')->toArray();
157157
}
158158

159159
return Cache::remember($cacheKey, Config::get('laratrust.cache.expiration_time', 60), function () {
160-
return $this->user->roles()->get()->toArray();
160+
return $this->user->getRelationValue('roles')->toArray();
161161
});
162162
}
163163

src/Traits/HasLaratrustScopes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Laratrust\Traits;
66

77
use BackedEnum;
8-
use Illuminate\Contracts\Database\Eloquent\Builder;
8+
use Illuminate\Database\Eloquent\Builder;
99
use Illuminate\Support\Facades\Config;
1010
use Laratrust\Helper;
1111
use Laratrust\Models\Team;

0 commit comments

Comments
 (0)