From 2cf9fcae3d26fb963ba4371443a6e70ad0e81760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 26 Jan 2016 11:13:02 +0100 Subject: [PATCH] REFACTORING: use BaseEnumeration Classes UserRoles and UserStates are now using new BaseEnumeration class. --- app/Enumerations/UserRoles.php | 34 ++++++--------------------------- app/Enumerations/UserStates.php | 34 ++++++--------------------------- 2 files changed, 12 insertions(+), 56 deletions(-) diff --git a/app/Enumerations/UserRoles.php b/app/Enumerations/UserRoles.php index e20d237d..5010796c 100644 --- a/app/Enumerations/UserRoles.php +++ b/app/Enumerations/UserRoles.php @@ -3,33 +3,11 @@ namespace App\Enumerations; use App\Models\User; -class UserRoles +class UserRoles extends BaseEnumeration { - /** - * Getter for roles - * - * This method returns only list of roles as inserted into database - * - * @return array - */ - public static function getSimple() - { - return array_values(self::getWithTranslations()); - } - - /** - * Getter for roles with translations - * - * This method returns all user roles as keys. Values are strings used for translations. - * - * @return array - */ - public static function getWithTranslations() - { - return [ - User::ROLE_ADMIN => 'admin/userManagement.role_' . User::ROLE_ADMIN, - User::ROLE_EDITOR => 'admin/userManagement.role_' . User::ROLE_EDITOR, - User::ROLE_VISITOR => 'admin/userManagement.role_' . User::ROLE_VISITOR - ]; - } + public static $items = [ + User::ROLE_ADMIN => 'admin/userManagement.role_' . User::ROLE_ADMIN, + User::ROLE_EDITOR => 'admin/userManagement.role_' . User::ROLE_EDITOR, + User::ROLE_VISITOR => 'admin/userManagement.role_' . User::ROLE_VISITOR + ]; } \ No newline at end of file diff --git a/app/Enumerations/UserStates.php b/app/Enumerations/UserStates.php index 4980084b..04abf705 100644 --- a/app/Enumerations/UserStates.php +++ b/app/Enumerations/UserStates.php @@ -10,33 +10,11 @@ namespace App\Enumerations; use App\Models\User; -class UserStates +class UserStates extends BaseEnumeration { - /** - * Getter for states - * - * This method returns only list of roles as inserted into database - * - * @return array - */ - public static function getSimple() - { - return array_values(self::getWithTranslations()); - } - - /** - * Getter for states with translations - * - * This method returns all user states as keys. Values are strings used for translations. - * - * @return array - */ - public static function getWithTranslations() - { - return [ - User::STATE_DELETED => 'admin/userManagement.status_' . User::STATE_DELETED, - User::STATE_BLOCKED => 'admin/userManagement.status_' . User::STATE_BLOCKED, - User::STATE_ACTIVE => 'admin/userManagement.status_' . User::STATE_ACTIVE - ]; - } + public static $items = [ + User::STATE_DELETED => 'admin/userManagement.status_' . User::STATE_DELETED, + User::STATE_BLOCKED => 'admin/userManagement.status_' . User::STATE_BLOCKED, + User::STATE_ACTIVE => 'admin/userManagement.status_' . User::STATE_ACTIVE + ]; } \ No newline at end of file