uidaho / smartsettia

app/Http/Controllers/HomeController.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-
 class HomeController extends Controller
 {
     /**

app/Notifications/InvoicePaid.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\NexmoMessage;
 
 class InvoicePaid extends Notification

app/Http/Controllers/ImageController.php

Unused Use Statements -2 removed lines

@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use Intervention\Image\Facades\Image as Image;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
 
 class ImageController extends Controller

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         if (Storage::disk('private')->exists('deviceimage/'.$device_id)) {
             $image = Image::make(Storage::disk('private')->get('deviceimage/'.$device_id));
         } else {
-            $image = Image::make(public_path() . '/img/video_not_found.jpg');
+            $image = Image::make(public_path().'/img/video_not_found.jpg');
         }
         
         return $image->response();
@@ -45,7 +45,7 @@ 
      */
     public function store($device_id, $binaryData)
     {
-        $storagePath = storage_path('app/private/deviceimage/') . $device_id;
+        $storagePath = storage_path('app/private/deviceimage/').$device_id;
         $image = Image::make($binaryData);
         $image->save($storagePath, 75);
     }

app/Notifications/DeviceRegister.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\NexmoMessage;
 
 class DeviceRegister extends Notification

app/Http/Controllers/DeviceController.php

Unused Use Statements -2 removed lines

@@ -3,10 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\EditDevice;
-use Validator;
 use Illuminate\Http\Request;
 use App\DataTables\DevicesDataTable;
-use Illuminate\Support\Facades\Route;
 use App\Device;
 use App\Site;
 use App\Location;

Spacing +8 added lines, -8 removed lines

@@ -77,7 +77,7 @@ 
         $sites = Site::select('id', 'name')->orderByRaw("id = ? DESC", $site_id)
             ->orderBy('name', 'ASC')->get();
         //Get all locations for the selected site with the selected location first
-        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[0]->id ?? 0)
+        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[ 0 ]->id ?? 0)
             ->orderByRaw("id = ? DESC", $location_id)->orderBy('name', 'ASC')->get();
         
         return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
@@ -98,7 +98,7 @@ 
         if (!empty($request->input('new_site_name')))
         {
             //Create a new site
-            $site = Site::create(['name' => $request->input('new_site_name')]);
+            $site = Site::create([ 'name' => $request->input('new_site_name') ]);
             $site_id = $site->id;
         }
         else
@@ -108,7 +108,7 @@ 
         if (!empty($request->input('new_location_name')))
         {
             //Create a new location
-            $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]);
+            $location = Location::create([ 'name' => $request->input('new_location_name'), 'site_id' => $site_id ]);
             $location_id = $location->id;
         }
         else
@@ -135,9 +135,9 @@ 
             if ($request->command === 'unlock')
             {
                 if ($device->isDuringScheduleOpen())
-                    $command =  'open';
+                    $command = 'open';
                 else
-                    $command =  'close';
+                    $command = 'close';
             }
             $device->cover_command = $command;
         }
@@ -145,7 +145,7 @@ 
         $device->save();
     
         if (\Request::ajax())
-            return response()->json(['success' => 'Device updated successfully']);
+            return response()->json([ 'success' => 'Device updated successfully' ]);
         else
             return redirect()->route('device.show', $id)
                 ->with('success', 'Device updated successfully');
@@ -177,7 +177,7 @@ 
         }
 
         return redirect()->route('device.index')
-            ->with('success','Device deleted successfully');
+            ->with('success', 'Device deleted successfully');
     }
     
     /**
@@ -193,6 +193,6 @@ 
         $device->restore();
         
         return redirect()->route('device.show', $device->id)
-            ->with('success','Device restored successfully');
+            ->with('success', 'Device restored successfully');
     }
 }

Braces +18 added lines, -16 removed lines

@@ -100,9 +100,9 @@ 
             //Create a new site
             $site = Site::create(['name' => $request->input('new_site_name')]);
             $site_id = $site->id;
+        } else {
+                    $site_id = $request->input('site_id');
         }
-        else
-            $site_id = $request->input('site_id');
         
         //Get the location id of the old or newly created location
         if (!empty($request->input('new_location_name')))
@@ -110,9 +110,9 @@ 
             //Create a new location
             $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]);
             $location_id = $location->id;
+        } else {
+                    $location_id = $request->input('location_id');
         }
-        else
-            $location_id = $request->input('location_id');
         
         //Update the device
         $device->location_id = $location_id;
@@ -126,29 +126,32 @@ 
         if ($request->input('command') != null)
         {
             //If device is currently opening, closing or in an error state don't update command
-            if (!$device->isReadyForCommand())
-                return response()->json("Device is currently in use.", 403);
+            if (!$device->isReadyForCommand()) {
+                            return response()->json("Device is currently in use.", 403);
+            }
     
             $command = $request->input('command');
             
             //If command is to unlock the device then check if the device should be open or closed based on the schedule
             if ($request->command === 'unlock')
             {
-                if ($device->isDuringScheduleOpen())
-                    $command =  'open';
-                else
-                    $command =  'close';
+                if ($device->isDuringScheduleOpen()) {
+                                    $command =  'open';
+                } else {
+                                    $command =  'close';
+                }
             }
             $device->cover_command = $command;
         }
         
         $device->save();
     
-        if (\Request::ajax())
-            return response()->json(['success' => 'Device updated successfully']);
-        else
-            return redirect()->route('device.show', $id)
+        if (\Request::ajax()) {
+                    return response()->json(['success' => 'Device updated successfully']);
+        } else {
+                    return redirect()->route('device.show', $id)
                 ->with('success', 'Device updated successfully');
+        }
     }
 
     /**
@@ -165,8 +168,7 @@ 
         {
             //If the device was already deleted then permanently delete it
             $device->forceDelete($device->id);
-        }
-        else
+        } else
         {
             //Remove the location from the device
             $device->location_id = null;

app/Http/Controllers/ActivityLogController.php

Doc Comments +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     /**
      * Display index page and process dataTable ajax request.
      *
-     * @param \App\DataTables\UsersDataTable $dataTable
+     * @param ActivityLogDataTable $dataTable
      * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
      */
     public function index(ActivityLogDataTable $dataTable)

Unused Use Statements -3 removed lines

@@ -2,11 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use Validator;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\DataTables\ActivityLogDataTable;
-use App\User;
 
 class ActivityLogController extends Controller
 {

app/Site.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      *
      * @var array
      */
-    protected static $ignoreChangedAttributes = ['updated_at'];
+    protected static $ignoreChangedAttributes = [ 'updated_at' ];
     
     /**
      * The attributes to log in the Activity Log

app/Location.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      *
      * @var array
      */
-    protected static $ignoreChangedAttributes = ['updated_at'];
+    protected static $ignoreChangedAttributes = [ 'updated_at' ];
     
     /**
      * The attributes to log in the Activity Log

app/Deviceimage.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      *
      * @var array
      */
-    protected static $ignoreChangedAttributes = ['updated_at'];
+    protected static $ignoreChangedAttributes = [ 'updated_at' ];
     
     /**
      * The attributes to log in the Activity Log