From 4ccbf6a967df068c60bd3d5f3c14dce331f1b4bb Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Mon, 25 Dec 2017 22:37:15 +0000
Subject: [PATCH] Apply fixes from StyleCI

[ci skip] [skip ci]
---
 _install/install_nntmux.php         |  2 +-
 app/Extensions/helper/helpers.php   |  2 +-
 app/Models/Invitation.php           |  2 +-
 app/Models/RoleExcludedCategory.php |  2 +-
 app/Models/User.php                 | 12 ++++++------
 public/admin/role-edit.php          |  2 +-
 public/admin/user-delete.php        |  2 +-
 public/pages/BasePage.php           |  4 ++--
 public/pages/forgottenpassword.php  |  2 +-
 public/pages/login.php              |  2 +-
 public/pages/profile.php            |  4 ++--
 public/pages/profileedit.php        |  4 ++--
 public/pages/register.php           |  5 ++---
 13 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/_install/install_nntmux.php b/_install/install_nntmux.php
index ef24660bd..ce4121b8c 100644
--- a/_install/install_nntmux.php
+++ b/_install/install_nntmux.php
@@ -6,8 +6,8 @@ if (! defined('NN_INSTALLER')) {
 require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'bootstrap/autoload.php';
 include_once dirname(__DIR__).DIRECTORY_SEPARATOR.'nntmux'.DIRECTORY_SEPARATOR.'constants.php';
 
-use App\Models\User;
 use nntmux\db\DB;
+use App\Models\User;
 use nntmux\ColorCLI;
 use nntmux\db\DbUpdate;
 use nntmux\config\Configure;
diff --git a/app/Extensions/helper/helpers.php b/app/Extensions/helper/helpers.php
index 27a82e11f..c4caf86db 100644
--- a/app/Extensions/helper/helpers.php
+++ b/app/Extensions/helper/helpers.php
@@ -153,7 +153,7 @@ if (! function_exists('makeFieldLinks')) {
                 'role_asc',
                 'role_desc',
                 'rolechangedate_asc',
-                'rolechangedate_desc'
+                'rolechangedate_desc',
             ];
         }
     }
diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
index 11b1a0382..40396228d 100644
--- a/app/Models/Invitation.php
+++ b/app/Models/Invitation.php
@@ -2,8 +2,8 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
+use Illuminate\Database\Eloquent\Model;
 
 class Invitation extends Model
 {
diff --git a/app/Models/RoleExcludedCategory.php b/app/Models/RoleExcludedCategory.php
index e63a00a1d..d4263ba9f 100644
--- a/app/Models/RoleExcludedCategory.php
+++ b/app/Models/RoleExcludedCategory.php
@@ -2,8 +2,8 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
+use Illuminate\Database\Eloquent\Model;
 
 class RoleExcludedCategory extends Model
 {
diff --git a/app/Models/User.php b/app/Models/User.php
index 11c9ffe1f..548c51987 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -2,17 +2,17 @@
 
 namespace App\Models;
 
-use App\Mail\AccountChange;
+use nntmux\Users;
 use App\Mail\SendInvite;
-use Illuminate\Notifications\Notifiable;
-use Illuminate\Foundation\Auth\User as Authenticatable;
+use App\Mail\AccountChange;
+use Illuminate\Support\Str;
+use nntmux\utility\Utility;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Password;
-use Illuminate\Support\Str;
-use nntmux\Users;
-use nntmux\utility\Utility;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 
 class User extends Authenticatable
 {
diff --git a/public/admin/role-edit.php b/public/admin/role-edit.php
index c00aa1dac..6fddf7b08 100644
--- a/public/admin/role-edit.php
+++ b/public/admin/role-edit.php
@@ -2,9 +2,9 @@
 
 require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php';
 
-use App\Models\RoleExcludedCategory;
 use nntmux\Category;
 use App\Models\UserRole;
+use App\Models\RoleExcludedCategory;
 
 $category = new Category();
 $page = new AdminPage();
diff --git a/public/admin/user-delete.php b/public/admin/user-delete.php
index 71b4a5dc5..f7092621f 100644
--- a/public/admin/user-delete.php
+++ b/public/admin/user-delete.php
@@ -2,8 +2,8 @@
 
 require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php';
 
-use App\Models\User;
 use nntmux\Users;
+use App\Models\User;
 
 $page = new AdminPage();
 
diff --git a/public/pages/BasePage.php b/public/pages/BasePage.php
index 9a6eb457c..5dda9beba 100644
--- a/public/pages/BasePage.php
+++ b/public/pages/BasePage.php
@@ -2,12 +2,12 @@
 
 require_once NN_LIB.'utility'.DS.'SmartyUtils.php';
 
-use App\Models\RoleExcludedCategory;
-use App\Models\User;
 use nntmux\db\DB;
 use nntmux\Users;
 use nntmux\SABnzbd;
+use App\Models\User;
 use App\Models\Settings;
+use App\Models\RoleExcludedCategory;
 
 class BasePage
 {
diff --git a/public/pages/forgottenpassword.php b/public/pages/forgottenpassword.php
index 2aba0cf41..091e301e2 100644
--- a/public/pages/forgottenpassword.php
+++ b/public/pages/forgottenpassword.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\User;
 use nntmux\Captcha;
+use App\Models\User;
 use App\Mail\PasswordReset;
 use App\Mail\ForgottenPassword;
 use Illuminate\Support\Facades\Mail;
diff --git a/public/pages/login.php b/public/pages/login.php
index 0ff3ba523..60a3b1938 100644
--- a/public/pages/login.php
+++ b/public/pages/login.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\User;
 use nntmux\Captcha;
 use nntmux\Logging;
+use App\Models\User;
 use App\Models\Settings;
 use nntmux\utility\Utility;
 
diff --git a/public/pages/profile.php b/public/pages/profile.php
index 814af6afc..245345106 100644
--- a/public/pages/profile.php
+++ b/public/pages/profile.php
@@ -1,13 +1,13 @@
 <?php
 
-use App\Models\User;
-use App\Models\UserExcludedCategory;
 use nntmux\NZBGet;
 use nntmux\SABnzbd;
+use App\Models\User;
 use App\Models\Settings;
 use App\Models\UserRequest;
 use nntmux\ReleaseComments;
 use App\Models\UserDownload;
+use App\Models\UserExcludedCategory;
 
 if (! User::isLoggedIn()) {
     $page->show403();
diff --git a/public/pages/profileedit.php b/public/pages/profileedit.php
index 789d6fcf4..a06f78e8f 100644
--- a/public/pages/profileedit.php
+++ b/public/pages/profileedit.php
@@ -1,13 +1,13 @@
 <?php
 
-use App\Models\User;
-use App\Models\UserExcludedCategory;
 use nntmux\Users;
 use nntmux\NZBGet;
 use nntmux\SABnzbd;
+use App\Models\User;
 use nntmux\Category;
 use App\Models\Settings;
 use nntmux\utility\Utility;
+use App\Models\UserExcludedCategory;
 
 $category = new Category;
 $sab = new SABnzbd($page);
diff --git a/public/pages/register.php b/public/pages/register.php
index bc6d630c9..4f132e429 100644
--- a/public/pages/register.php
+++ b/public/pages/register.php
@@ -1,11 +1,10 @@
 <?php
 
-use App\Models\Invitation;
-use App\Models\User;
-use nntmux\Users;
 use nntmux\Captcha;
+use App\Models\User;
 use App\Models\Settings;
 use App\Models\UserRole;
+use App\Models\Invitation;
 use nntmux\utility\Utility;
 
 if (User::isLoggedIn()) {