X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/bfbccbede14853c68edecf5dd5d08a50a6ed5c9d..refs/pull/3043/head:/app/Auth/User.php diff --git a/app/Auth/User.php b/app/Auth/User.php index da47a9d69..540a8d7ab 100644 --- a/app/Auth/User.php +++ b/app/Auth/User.php @@ -18,6 +18,7 @@ use Illuminate\Auth\Passwords\CanResetPassword; use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; @@ -43,6 +44,7 @@ use Illuminate\Support\Collection; */ class User extends Model implements AuthenticatableContract, CanResetPasswordContract, Loggable, Sluggable { + use HasFactory; use Authenticatable; use CanResetPassword; use Notifiable; @@ -90,7 +92,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon /** * Returns the default public user. */ - public static function getDefault(): User + public static function getDefault(): self { if (!is_null(static::$defaultUser)) { return static::$defaultUser; @@ -176,7 +178,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon ->leftJoin('permission_role', 'ru.role_id', '=', 'permission_role.role_id') ->leftJoin('role_permissions', 'permission_role.permission_id', '=', 'role_permissions.id') ->where('ru.user_id', '=', $this->id) - ->get() ->pluck('name'); return $this->permissions; @@ -336,7 +337,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon } /** - * @inheritdoc + * {@inheritdoc} */ public function logDescriptor(): string { @@ -344,7 +345,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon } /** - * @inheritDoc + * {@inheritdoc} */ public function refreshSlug(): string {