Use static variable instead of class constant for USER_ROLES for 5.5.9 compat, fix #264

3 files changed, 5 insertions, 5 deletions

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 687dfd5..1902bab 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -31,8 +31,8 @@ class AdminController extends Controller {
 
         return view('admin', [
             'role' => $role,
-            'admin_role' => UserHelper::USER_ROLES['admin'],
-            'user_roles' => UserHelper::USER_ROLES,
+            'admin_role' => UserHelper::$USER_ROLES['admin'],
+            'user_roles' => UserHelper::$USER_ROLES,
             'api_key' => $user->api_key,
             'api_active' => $user->api_active,
             'api_quota' => $user->api_quota,
diff --git a/app/Http/Controllers/AdminPaginationController.php b/app/Http/Controllers/AdminPaginationController.php
index 5972363..9add38d 100644
--- a/app/Http/Controllers/AdminPaginationController.php
+++ b/app/Http/Controllers/AdminPaginationController.php
@@ -59,7 +59,7 @@ class AdminPaginationController extends Controller {
                 }
                 $select_role .= '>';
 
-                foreach (UserHelper::USER_ROLES as $role_text => $role_val) {
+                foreach (UserHelper::$USER_ROLES as $role_text => $role_val) {
                     // Iterate over each available role and output option
                     $select_role .= '<option value="' . e($role_val) . '"';
 
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index d2c96df..c02adec 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -98,7 +98,7 @@ class SetupController extends Controller {
         $acct_username = $request->input('acct:username');
         $acct_email = $request->input('acct:email');
         $acct_password = $request->input('acct:password');
-        $acct_group = UserHelper::USER_ROLES['admin'];
+        $acct_group = UserHelper::$USER_ROLES['admin'];
 
         // if true, only logged in users can shorten
         $st_shorten_permission = $request->input('setting:shorten_permission');
@@ -215,7 +215,7 @@ class SetupController extends Controller {
             return redirect(route('setup'))->with('error', 'Could not create database. Perhaps some credentials were incorrect?');
         }
 
-        $user = UserFactory::createUser($setup_finish_args->acct_username, $setup_finish_args->acct_email, $setup_finish_args->acct_password, 1, $request->ip(), false, 0, UserHelper::USER_ROLES['admin']);
+        $user = UserFactory::createUser($setup_finish_args->acct_username, $setup_finish_args->acct_email, $setup_finish_args->acct_password, 1, $request->ip(), false, 0, UserHelper::$USER_ROLES['admin']);
 
         return view('setup_thanks')->with('success', 'Set up completed! Thanks for using Polr!');
     }