Fix Imports

Author: maxdestors

app/Http/Controllers/ProfilesController.php

@@ -10,15 +10,14 @@
 use App\Models\User;
 use App\Notifications\SendGoodbyeEmail;
 use App\Traits\CaptureIpTrait;
-use File;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Session;
-use Image;
+use Intervention\Image\Facades\Image;
 use jeremykenedy\Uuid\Uuid;
-use Validator;
-use View;
+use Illuminate\Support\Facades\Validator;
 
 class ProfilesController extends Controller
 {
@@ -143,7 +142,7 @@ public function update(UpdateUserProfile $request, $username)
      */
     public function updateUserAccount(Request $request, $id)
     {
-        $currentUser = \Auth::user();
+        $currentUser = Auth::user();
         $user = User::findOrFail($id);
         $emailCheck = ($request->input('email') !== '') && ($request->input('email') !== $user->email);
         $ipAddress = new CaptureIpTrait();
@@ -203,7 +202,7 @@ public function updateUserAccount(Request $request, $id)
      */
     public function updateUserPassword(UpdateUserPasswordRequest $request, $id)
     {
-        $currentUser = \Auth::user();
+        $currentUser = Auth::user();
         $user = User::findOrFail($id);
         $ipAddress = new CaptureIpTrait();
 
@@ -226,15 +225,15 @@ public function updateUserPassword(UpdateUserPasswordRequest $request, $id)
     public function upload(Request $request)
     {
         if ($request->hasFile('file')) {
-            $currentUser = \Auth::user();
+            $currentUser = Auth::user();
             $avatar = $request->file('file');
             $filename = 'avatar.'.$avatar->getClientOriginalExtension();
             $save_path = storage_path().'/users/id/'.$currentUser->id.'/uploads/images/avatar/';
             $path = $save_path.$filename;
             $public_path = '/images/profile/'.$currentUser->id.'/avatar/'.$filename;
 
             // Make the user a folder and set permissions
-            File::makeDirectory($save_path, $mode = 0755, true, true);
+            Filesystem::makeDirectory($save_path, $mode = 0755, true, true);
 
             // Save the file to the server
             Image::make($avatar)->resize(300, 300)->save($save_path.$filename);
@@ -270,7 +269,7 @@ public function userProfileAvatar($id, $image)
      */
     public function deleteUserAccount(DeleteUserAccount $request, $id)
     {
-        $currentUser = \Auth::user();
+        $currentUser = Auth::user();
         $user = User::findOrFail($id);
         $ipAddress = new CaptureIpTrait();
 
@@ -310,7 +309,7 @@ public function deleteUserAccount(DeleteUserAccount $request, $id)
     /**
      * Send GoodBye Email Function via Notify.
      *
-     * @param  array  $user
+     * @param  User  $user
      * @param  string  $token
      * @return void
      */

app/Http/Controllers/ThemesManagementController.php

@@ -5,7 +5,7 @@
 use App\Models\Theme;
 use App\Models\User;
 use Illuminate\Http\Request;
-use Validator;
+use Illuminate\Support\Facades\Validator;
 
 class ThemesManagementController extends Controller
 {

app/Http/Controllers/UsersManagementController.php

@@ -6,11 +6,11 @@
 use App\Models\Role;
 use App\Models\User;
 use App\Traits\CaptureIpTrait;
-use Auth;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Validator;
+use Illuminate\Support\Facades\Validator;
 
 class UsersManagementController extends Controller
 {

config/app.php

@@ -4,7 +4,6 @@
 use App\Providers\MacroServiceProvider;
 use Creativeorange\Gravatar\Facades\Gravatar;
 use Illuminate\Support\Facades\Facade;
-use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redis;
 use Intervention\Image\Facades\Image;
 use jeremykenedy\Uuid\Uuid;
@@ -220,7 +219,6 @@
     'aliases' => Facade::defaultAliases()->merge([
         'Redis'     => Redis::class,
         'Socialite' => Socialite::class,
-        'Input'     => Input::class,
         'Gravatar'  => Gravatar::class,
         'Image'     => Image::class,
         'Uuid'      => Uuid::class,