chore: code cleanup.

app/Repositories/User/UserRepository.php

@@ -43,6 +43,39 @@ use Str;
  */
 class UserRepository implements UserRepositoryInterface
 {
+    /**
+     * @return Collection
+     */
+    public function all(): Collection
+    {
+        return User::orderBy('id', 'DESC')->get(['users.*']);
+    }
+
+    /**
+     * @param  User  $user
+     * @param  string  $role
+     *
+     * @return bool
+     */
+    public function attachRole(User $user, string $role): bool
+    {
+        $roleObject = Role::where('name', $role)->first();
+        if (null === $roleObject) {
+            Log::error(sprintf('Could not find role "%s" in attachRole()', $role));
+
+            return false;
+        }
+
+        try {
+            $user->roles()->attach($roleObject);
+        } catch (QueryException $e) {
+            // don't care
+            Log::error(sprintf('Query exception when giving user a role: %s', $e->getMessage()));
+        }
+
+        return true;
+    }
+
     /**
      * This updates the users email address and records some things so it can be confirmed or undone later.
      * The user is blocked until the change is confirmed.
@@ -107,6 +140,14 @@ class UserRepository implements UserRepositoryInterface
         return true;
     }
 
+    /**
+     * @return int
+     */
+    public function count(): int
+    {
+        return $this->all()->count();
+    }
+
     /**
      * @param  string  $name
      * @param  string  $displayName
@@ -119,6 +160,22 @@ class UserRepository implements UserRepositoryInterface
         return Role::create(['name' => $name, 'display_name' => $displayName, 'description' => $description]);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function deleteEmptyGroups(): void
+    {
+        $groups = UserGroup::get();
+        /** @var UserGroup $group */
+        foreach ($groups as $group) {
+            $count = $group->groupMemberships()->count();
+            if (0 === $count) {
+                Log::info(sprintf('Deleted empty group #%d ("%s")', $group->id, $group->title));
+                $group->delete();
+            }
+        }
+    }
+
     /**
      * @inheritDoc
      */
@@ -146,35 +203,13 @@ class UserRepository implements UserRepositoryInterface
     }
 
     /**
-     * @inheritDoc
+     * @param  int  $userId
+     *
+     * @return User|null
      */
-    public function deleteEmptyGroups(): void
+    public function find(int $userId): ?User
     {
-        $groups = UserGroup::get();
-        /** @var UserGroup $group */
-        foreach ($groups as $group) {
-            $count = $group->groupMemberships()->count();
-            if (0 === $count) {
-                Log::info(sprintf('Deleted empty group #%d ("%s")', $group->id, $group->title));
-                $group->delete();
-            }
-        }
-    }
-
-    /**
-     * @return int
-     */
-    public function count(): int
-    {
-        return $this->all()->count();
-    }
-
-    /**
-     * @return Collection
-     */
-    public function all(): Collection
-    {
-        return User::orderBy('id', 'DESC')->get(['users.*']);
+        return User::find($userId);
     }
 
     /**
@@ -205,6 +240,16 @@ class UserRepository implements UserRepositoryInterface
         return InvitedUser::with('user')->get();
     }
 
+    /**
+     * @param  string  $role
+     *
+     * @return Role|null
+     */
+    public function getRole(string $role): ?Role
+    {
+        return Role::where('name', $role)->first();
+    }
+
     /**
      * @param  User  $user
      *
@@ -242,16 +287,6 @@ class UserRepository implements UserRepositoryInterface
         return $roles;
     }
 
-    /**
-     * @param  int  $userId
-     *
-     * @return User|null
-     */
-    public function find(int $userId): ?User
-    {
-        return User::find($userId);
-    }
-
     /**
      * Return basic user information.
      *
@@ -340,6 +375,21 @@ class UserRepository implements UserRepositoryInterface
         }
     }
 
+    /**
+     * Remove any role the user has.
+     *
+     * @param  User  $user
+     * @param  string  $role
+     */
+    public function removeRole(User $user, string $role): void
+    {
+        $roleObj = $this->getRole($role);
+        if (null === $roleObj) {
+            return;
+        }
+        $user->roles()->detach($roleObj->id);
+    }
+
     /**
      * Set MFA code.
      *
@@ -375,31 +425,6 @@ class UserRepository implements UserRepositoryInterface
         return $user;
     }
 
-    /**
-     * @param  User  $user
-     * @param  string  $role
-     *
-     * @return bool
-     */
-    public function attachRole(User $user, string $role): bool
-    {
-        $roleObject = Role::where('name', $role)->first();
-        if (null === $roleObject) {
-            Log::error(sprintf('Could not find role "%s" in attachRole()', $role));
-
-            return false;
-        }
-
-        try {
-            $user->roles()->attach($roleObject);
-        } catch (QueryException $e) {
-            // don't care
-            Log::error(sprintf('Query exception when giving user a role: %s', $e->getMessage()));
-        }
-
-        return true;
-    }
-
     /**
      * @param  User  $user
      */
@@ -466,31 +491,6 @@ class UserRepository implements UserRepositoryInterface
         return true;
     }
 
-    /**
-     * Remove any role the user has.
-     *
-     * @param  User  $user
-     * @param  string  $role
-     */
-    public function removeRole(User $user, string $role): void
-    {
-        $roleObj = $this->getRole($role);
-        if (null === $roleObj) {
-            return;
-        }
-        $user->roles()->detach($roleObj->id);
-    }
-
-    /**
-     * @param  string  $role
-     *
-     * @return Role|null
-     */
-    public function getRole(string $role): ?Role
-    {
-        return Role::where('name', $role)->first();
-    }
-
     /**
      * @inheritDoc
      */