From 8c4cbd1d9fd4724821642301848c55e044b0f2b4 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Fri, 14 Feb 2025 00:48:37 +0330 Subject: [PATCH 1/2] refactor: `display()` method to enhance readability and maintainability --- src/Collectors/Auth.php | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/Collectors/Auth.php b/src/Collectors/Auth.php index 7ce74f148..8814cf47a 100644 --- a/src/Collectors/Auth.php +++ b/src/Collectors/Auth.php @@ -74,26 +74,25 @@ public function getTitleDetails(): string public function display(): string { if ($this->auth->loggedIn()) { - $user = $this->auth->user(); - $groups = $user->getGroups(); - $permissions = $user->getPermissions(); - - $groupsForUser = implode(', ', $groups); - $permissionsForUser = implode(', ', $permissions); - - $html = '

Current User

'; - $html .= ''; - $html .= ""; - $html .= ""; - $html .= ""; - $html .= ""; - $html .= ""; - $html .= '
User ID#{$user->id}
Username{$user->username}
Email{$user->email}
Groups{$groupsForUser}
Permissions{$permissionsForUser}
'; - } else { - $html = '

Not logged in.

'; + $user = $this->auth->user(); + $groups = implode(', ', $user->getGroups()); + $permissions = implode(', ', $user->getPermissions()); + + return <<Current User + + + + + + + + +
User ID#{$user->id}
Username{$user->username}
Email{$user->email}
Groups{$groups}
Permissions{$permissions}
+ HTML; } - - return $html; + + return '

Not logged in.

'; } /** From de6eeb646f09e00fbbb85f1458a9cc839eae7e5f Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Fri, 14 Feb 2025 01:33:29 +0330 Subject: [PATCH 2/2] style: fix code style --- src/Collectors/Auth.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Collectors/Auth.php b/src/Collectors/Auth.php index 8814cf47a..c7eec16fc 100644 --- a/src/Collectors/Auth.php +++ b/src/Collectors/Auth.php @@ -74,24 +74,24 @@ public function getTitleDetails(): string public function display(): string { if ($this->auth->loggedIn()) { - $user = $this->auth->user(); - $groups = implode(', ', $user->getGroups()); + $user = $this->auth->user(); + $groups = implode(', ', $user->getGroups()); $permissions = implode(', ', $user->getPermissions()); return <<Current User - - - - - - - - -
User ID#{$user->id}
Username{$user->username}
Email{$user->email}
Groups{$groups}
Permissions{$permissions}
- HTML; +

Current User

+ + + + + + + + +
User ID#{$user->id}
Username{$user->username}
Email{$user->email}
Groups{$groups}
Permissions{$permissions}
+ HTML; } - + return '

Not logged in.

'; }