butcherman / Tech_Bench

app/Http/Controllers/Admin/UserController.php

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
     //  Show the list of current users to edit
     public function index()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $userList = User::with('LastUserLogin')->get()->makeVisible('user_id');
         $route    = 'admin.user.edit';
@@ -71,7 +71,7 @@ 
     //  Show the Add User form
     public function create()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $roles = UserRoleType::all();
         $roleArr = [];
@@ -154,7 +154,7 @@ 
     //  List all inactive users
     public function show($type)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         $route = '';
 
         if($type !== 'inactive')
@@ -177,10 +177,10 @@ 
     //  Reactivate a disabled user
     public function reactivateUser($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         User::withTrashed()->where('user_id', $id)->restore();
 
-        Log::notice('User ID ' . $id . ' reactivated by ' . Auth::user()->full_name);
+        Log::notice('User ID '.$id.' reactivated by '.Auth::user()->full_name);
         return response()->json([
             'success' => true,
         ]);
@@ -189,13 +189,13 @@ 
     //  Open the edit user form
     public function edit($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $roles = UserRoleType::all();
         $user  = new UserResource(User::findOrFail($id));
 
         //  Make sure that the user is not trying to edit someone with more permissions
-        if(($user->role_id == 1 || $user->role_id == 2) && Auth::user()->role_id <=2)
+        if(($user->role_id == 1 || $user->role_id == 2) && Auth::user()->role_id <= 2)
         {
             Log::warning('User '.Auth::user()->full_name.' tried to update user ID '.$id.' that has more permissions than they do.  This request was denied.');
             return abort(403);
@@ -205,13 +205,13 @@ 
 
         //  Good to go - get role information
         $roleArr = [];
-        foreach ($roles as $role)
+        foreach($roles as $role)
         {
-            if ($role->role_id == 1 && Auth::user()->role_id != 1)
+            if($role->role_id == 1 && Auth::user()->role_id != 1)
             {
                 continue;
             }
-            else if ($role->role_id == 2 && Auth::user()->role_id > 2)
+            else if($role->role_id == 2 && Auth::user()->role_id > 2)
             {
                 continue;
             }
@@ -257,7 +257,7 @@ 
         $user = User::findOrFail($id);
         if($user->role_id < Auth::user()->role_id)
         {
-            Log::warning('User ' . Auth::user()->full_name . ' tried to update user ID ' . $id . ' that has more permissions than they do.  This request was denied.');
+            Log::warning('User '.Auth::user()->full_name.' tried to update user ID '.$id.' that has more permissions than they do.  This request was denied.');
             return abort(403);
         }
 
@@ -297,13 +297,13 @@ 
         $user = User::find($request->user_id);
 
         //  Verify this is a valid user ID
-        if (!$user)
+        if(!$user)
         {
             $success = false;
             $reason  = 'Cannot find user with this ID';
         }
         //  Make sure that the user is not trying to deactivate someone with more permissions
-        else if ($user->role_id < Auth::user()->role_id)
+        else if($user->role_id < Auth::user()->role_id)
         {
             $success = false;
             $reason  = 'You cannot change password for a user with higher permissions that you.  If this user has locked themselves out, have then use the reset link on the login page.';
@@ -335,7 +335,7 @@ 
     //  Disable the user
     public function destroy($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $user = User::find($id);
 

app/Http/Controllers/Admin/CustomerAdminController.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
     public function __construct()
     {
         $this->middleware('auth');
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             $this->authorize('hasAccess', 'Manage Customers');
             return $next($request);
         });
@@ -50,14 +50,14 @@ 
     //  Form to view what kind of file types can be assigned to customers
     public function fileTypes()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         return view('admin.customerFileTypes');
     }
 
     //  Get the types of files that can be assigned to a customer file
     public function getFileTypes()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $types = new CustomerFileTypesCollection(CustomerFileTypes::all());
 
@@ -68,7 +68,7 @@ 
     //  Submit a new file type name
     public function submitNewFileType(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name . '. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
         $request->validate([
             'name' => 'required',
         ]);
@@ -77,14 +77,14 @@ 
             'description' => $request->name,
         ]);
 
-        Log::notice('New Customer File Type ' . $request->name . ' created by '. Auth::user()->full_name);
+        Log::notice('New Customer File Type '.$request->name.' created by '.Auth::user()->full_name);
         return response()->json(['success' => true]);
     }
 
     //  Update the name of a file type
     public function setFileTypes(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name . '. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
         $request->validate([
             'name' => 'required',
             'id'   => 'required|exists:customer_file_types,file_type_id',
@@ -101,14 +101,14 @@ 
     //  Try to delete a file type
     public function delFileType($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         try {
             //  Try to delete file type from database - will throw error if foreign key is in use
             CustomerFileTypes::find($id)->delete();
-        } catch (\Illuminate\Database\QueryException $e) {
+        } catch(\Illuminate\Database\QueryException $e) {
             //  Unable to remove file type  from the database
-            Log::warning('Attempt to delete file type ID '.$id.' by User '.Auth::user()->full_name.' failed.  Reason - ' . $e);
+            Log::warning('Attempt to delete file type ID '.$id.' by User '.Auth::user()->full_name.' failed.  Reason - '.$e);
             return response()->json(['success' => false, 'reason' => 'In Use']);
         }
 
@@ -119,7 +119,7 @@ 
     //  Show all disabled customers
     public function showDisabled()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $custList = Customers::select('cust_id', 'name', 'deleted_at')
             ->onlyTrashed()
@@ -133,7 +133,7 @@ 
     //  Re-enable a customer
     public function enableCustomer($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         Customers::withTrashed()->where('cust_id', $id)->restore();
 

Braces +5 added lines, -2 removed lines

@@ -103,10 +103,13 @@
     {
         Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
 
-        try {
+        try
+        {
             //  Try to delete file type from database - will throw error if foreign key is in use
             CustomerFileTypes::find($id)->delete();
-        } catch (\Illuminate\Database\QueryException $e) {
+        }
+        catch (\Illuminate\Database\QueryException $e)
+        {
             //  Unable to remove file type  from the database
             Log::warning('Attempt to delete file type ID '.$id.' by User '.Auth::user()->full_name.' failed.  Reason - ' . $e);
             return response()->json(['success' => false, 'reason' => 'In Use']);

app/Console/Commands/backupRestore.php

Doc Comments +8 added lines, -1 removed lines

@@ -42,7 +42,7 @@ 
     /**
      * Execute the console command.
      *
-     * @return mixed
+     * @return integer
      */
     public function handle()
     {
@@ -128,6 +128,9 @@ 
         }
     }
 
+    /**
+     * @param string $disk
+     */
     protected function clearAllFiles($disk)
     {
         $files = Storage::disk($disk)->files();
@@ -145,6 +148,10 @@ 
         }
     }
 
+    /**
+     * @param string $backupFolder
+     * @param string $disk
+     */
     protected function copyAllFiles($backupFolder, $disk)
     {
         $files = Storage::disk('backup')->allFiles($this->baseName.DIRECTORY_SEPARATOR.$backupFolder);

app/Notifications/NewTechTip.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      * Get the notification's delivery channels.
      *
      * @param  mixed  $notifiable
-     * @return array
+     * @return string[]
      */
     public function via($notifiable)
     {

app/Notifications/NewTechTipComment.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * Get the notification's delivery channels.
      *
      * @param  mixed  $notifiable
-     * @return array
+     * @return string[]
      */
     public function via($notifiable)
     {

app/Notifications/NewUserEmail.php

Doc Comments +2 added lines, -1 removed lines

@@ -15,6 +15,7 @@ 
     /**
      * Create a new notification instance.
      *
+     * @param string $hash
      * @return void
      */
     public function __construct($user, $hash)
@@ -28,7 +29,7 @@ 
      * Get the notification's delivery channels.
      *
      * @param  mixed  $notifiable
-     * @return array
+     * @return string[]
      */
     public function via(/** @scrutinizer ignore-unused */$notifiable)
     {