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/DashboardController.php

Doc Comments +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
      *
      * @param  Request  $request
      * @param Device $device
-     * @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Http\JsonResponse
      */
     public function updateCommand(Request $request, Device $device)
     {

Spacing +12 added lines, -12 removed lines

@@ -35,7 +35,7 @@ 
             //Get the first device that doesn't have a null location_id
             $device = Device::publicDashData()->where('location_id', '!=', 'null')->orderBy('id', 'ASC')->first();
         }
-        catch(ModelNotFoundException $e)
+        catch (ModelNotFoundException $e)
         {
             //If no device is found then redirect the user to the home page and display a message about registering a device
             return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -48,7 +48,7 @@ 
     
         $data = $this->dashData($site, $location, $device);
         
-        return view('dashboard.index', [ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return view('dashboard.index', [ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -92,7 +92,7 @@ 
                 //Get the first site and if no sites exist throw an error
                 $site = Site::select('id', 'name')->firstOrFail();
             }
-            catch(ModelNotFoundException $e)
+            catch (ModelNotFoundException $e)
             {
                 //If no device is found then redirect the user to the home page and display a message about registering a device
                 return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -118,7 +118,7 @@ 
         
         $data = $this->dashData($site, $location, $device);
         
-        return response()->json([ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return response()->json([ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -138,7 +138,7 @@ 
         
         $data = $this->dashData($site, $location, $device);
         
-        return response()->json([ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return response()->json([ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -158,7 +158,7 @@ 
         
         $data = $this->dashData($site, $location, $device);
         
-        return response()->json([ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return response()->json([ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -180,9 +180,9 @@ 
         //Get all the devices that belong to the given location ordered by name
         $devices = $location->devices()->publicDashData()->orderBy('name', 'ASC')->get();
         
-        $active_device = collect([$device, $location, $site]);
+        $active_device = collect([ $device, $location, $site ]);
         
-        return collect([$active_device, $devices, $locations, $sites]);
+        return collect([ $active_device, $devices, $locations, $sites ]);
     }
     
     /**
@@ -203,7 +203,7 @@ 
             return response()->json("Device is currently in use.", 403);
         
         //1 = open, 2 = close, 3 = lock
-        switch($request->command)
+        switch ($request->command)
         {
             case 1:
                 $device->cover_command = 'open';
@@ -239,12 +239,12 @@ 
             
             //Check if the current time is during the open schedule or not
             if (($time_now > $open_time) && ($time_now < $close_time))
-                $command =  'open';
+                $command = 'open';
             else
-                $command =  'close';
+                $command = 'close';
         }
         else
-            $command =  'lock';
+            $command = 'lock';
         
         return $command;
     }

Braces +21 added lines, -17 removed lines

@@ -34,8 +34,7 @@ 
             //Todo use the users preferred device
             //Get the first device that doesn't have a null location_id
             $device = Device::publicDashData()->where('location_id', '!=', 'null')->orderBy('id', 'ASC')->first();
-        }
-        catch(ModelNotFoundException $e)
+        } catch(ModelNotFoundException $e)
         {
             //If no device is found then redirect the user to the home page and display a message about registering a device
             return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -85,14 +84,15 @@ 
         //Get the given device if it is still at the same location
         $device = Device::publicDashData()->where('location_id', '=', $request->location_id)->find($request->device_id);
         
-        if (empty($site))                 //Check if the site still exists
+        if (empty($site)) {
+            //Check if the site still exists
         {
             try
             {
                 //Get the first site and if no sites exist throw an error
                 $site = Site::select('id', 'name')->firstOrFail();
-            }
-            catch(ModelNotFoundException $e)
+        }
+            } catch(ModelNotFoundException $e)
             {
                 //If no device is found then redirect the user to the home page and display a message about registering a device
                 return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -102,19 +102,21 @@ 
             $location = $site->locations()->select('id', 'name', 'site_id')->firstOrFail();
             //Get the first device from the location
             $device = $location->devices()->publicDashData()->firstOrFail();
-        }
-        else if (empty($location))        //Check if the location still exists
+        } else if (empty($location)) {
+            //Check if the location still exists
         {
             //Get the first location from the given site
             $location = $site->locations()->select('id', 'name', 'site_id')->firstOrFail();
+        }
             //Get the first device from the location
             $device = $location->devices()->publicDashData()->firstOrFail();
-        }
-        else if (empty($device))        //Check if the device still exists at the given location
+        } else if (empty($device)) {
+            //Check if the device still exists at the given location
         {
             //Get the first device from the location
             $device = $location->devices()->publicDashData()->firstOrFail();
         }
+        }
         
         $data = $this->dashData($site, $location, $device);
         
@@ -199,8 +201,9 @@ 
         ])->validate();
         
         //Check that device isn't currently in use or has an error
-        if ($device->cover_status === 'opening' || $device->cover_status === 'closing' || $device->cover_status === 'error')
-            return response()->json("Device is currently in use.", 403);
+        if ($device->cover_status === 'opening' || $device->cover_status === 'closing' || $device->cover_status === 'error') {
+                    return response()->json("Device is currently in use.", 403);
+        }
         
         //1 = open, 2 = close, 3 = lock
         switch($request->command)
@@ -238,13 +241,14 @@ 
             $time_now = Carbon::now(Auth::user()->timezone);
             
             //Check if the current time is during the open schedule or not
-            if (($time_now > $open_time) && ($time_now < $close_time))
-                $command =  'open';
-            else
-                $command =  'close';
+            if (($time_now > $open_time) && ($time_now < $close_time)) {
+                            $command =  'open';
+            } else {
+                            $command =  'close';
+            }
+        } else {
+                    $command =  'lock';
         }
-        else
-            $command =  'lock';
         
         return $command;
     }

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;

Doc Comments +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
      * Return null if the site does not have any locations
      *
      * @param  int $site_id
-     * @return Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Http\JsonResponse
      */
     public function locations($site_id)
     {
@@ -121,7 +121,7 @@ 
      * Return 404 error if the device is not found
      *
      * @param  int $id
-     * @return Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Http\JsonResponse
      */
     public function details($id)
     {

Braces +16 added lines, -16 removed lines

@@ -84,8 +84,7 @@ 
             $sites->prepend($location->site);
             //Add the current location to the front of the collection of locations
             $locations->prepend($location);
-        }
-        else
+        } else
         {
             //Set locations to null since there is no site or location attached to the selected device
             $locations = null;
@@ -93,10 +92,11 @@ 
             $sites = Site::all();
         }
         
-        if (\Request::ajax())
-            return response()->json([ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
-        else
-            return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
+        if (\Request::ajax()) {
+                    return response()->json([ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
+        } else {
+                    return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
+        }
     }
     
     /**
@@ -110,8 +110,9 @@ 
     {
         $locations = Location::bySite($site_id)->select('id', 'name', 'site_id')->get();
         
-        if ($locations->isEmpty())
-            $locations = null;
+        if ($locations->isEmpty()) {
+                    $locations = null;
+        }
     
         return response()->json($locations);
     }
@@ -151,8 +152,7 @@ 
             //Create a new site
             $siteName = $request->input('new_site_name');
             $site_id = Site::createSite($siteName)->id;
-        }
-        else
+        } else
         {
             $site_id = $request->input('site');
         }
@@ -166,8 +166,7 @@ 
             //Create a new location
             $locationName = $request->input('new_location_name');
             $location_id = Location::createLocation($locationName, $site_id)->id;
-        }
-        else
+        } else
         {
             $location_id = $request->input('location');
         }
@@ -188,11 +187,12 @@ 
         //Remove any unused sites or locations
         $this->RemoveUnusedSiteLoc();
     
-        if (\Request::ajax())
-            return response()->json("Success");
-        else
-            return redirect()->route('device.show', $id)
+        if (\Request::ajax()) {
+                    return response()->json("Success");
+        } else {
+                    return redirect()->route('device.show', $id)
                 ->with('success', 'Device updated successfully');
+        }
     }
 
     /**

Spacing +4 added lines, -4 removed lines

@@ -57,9 +57,9 @@ 
     {
         $device = Device::findOrFail($id);
         
-        $charts = [];
+        $charts = [ ];
         foreach ($device->sensors as $sensor) {
-            $charts[$sensor->id] = Charts::create('line', 'highcharts')
+            $charts[ $sensor->id ] = Charts::create('line', 'highcharts')
                 ->title($sensor->name)
                 ->elementLabel($sensor->type)
                 ->labels($sensor->last_week_daily_avg_data->pluck('date'))
@@ -226,7 +226,7 @@ 
         }
 
         return redirect()->route('device.index')
-            ->with('success','Device deleted successfully');
+            ->with('success', 'Device deleted successfully');
     }
     
     /**
@@ -242,6 +242,6 @@ 
         $device->restore();
         
         return redirect()->route('device.show', $device->id)
-            ->with('success','Device restored successfully');
+            ->with('success', 'Device restored successfully');
     }
 }

app/Device.php

Braces +10 added lines, -8 removed lines

@@ -75,8 +75,9 @@ 
         $time = new Carbon($value, 'UTC');
         
         //If the user is logged in then use there preferred timezone
-        if (Auth::check())
-            $time = $time->setTimezone(Auth::user()->timezone);
+        if (Auth::check()) {
+                    $time = $time->setTimezone(Auth::user()->timezone);
+        }
 
         return $time->format('H:i');
     }
@@ -94,8 +95,9 @@ 
         $time = new Carbon($value, 'UTC');
     
         //If the user is logged in then use there preferred timezone
-        if (Auth::check())
-            $time = $time->setTimezone(Auth::user()->timezone);
+        if (Auth::check()) {
+                    $time = $time->setTimezone(Auth::user()->timezone);
+        }
         
         return $time->format('H:i');
     }
@@ -115,9 +117,9 @@ 
         {
             $time = new Carbon($value, Auth::user()->timezone);
             $time = $time->setTimezone('UTC');
+        } else {
+                    $time = new Carbon($value, 'UTC');
         }
-        else
-            $time = new Carbon($value, 'UTC');
         
         $this->attributes['open_time'] = $time;
     }
@@ -137,9 +139,9 @@ 
         {
             $time = new Carbon($value, Auth::user()->timezone);
             $time = $time->setTimezone('UTC');
+        } else {
+                    $time = new Carbon($value, 'UTC');
         }
-        else
-            $time = new Carbon($value, 'UTC');
         
         $this->attributes['close_time'] = $time;
     }

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
      *
      * @var array
      */
-    protected $hidden = ['token'];
+    protected $hidden = [ 'token' ];
     
     /**
      * The attributes that are mass assignable.
@@ -50,7 +50,7 @@ 
      *
      * @var array
      */
-    protected static $ignoreChangedAttributes = ['updated_at'];
+    protected static $ignoreChangedAttributes = [ 'updated_at' ];
     
     /**
      * The attributes to log in the Activity Log
@@ -91,7 +91,7 @@ 
      */
     public function getSiteAttribute()
     {
-        return $this->location->site ?? (object)[];
+        return $this->location->site ?? (object) [ ];
     }
     
     /**
@@ -151,7 +151,7 @@ 
         else
             $time = new Carbon($value, 'UTC');
         
-        $this->attributes['open_time'] = $time;
+        $this->attributes[ 'open_time' ] = $time;
     }
     
     /**
@@ -173,7 +173,7 @@ 
         else
             $time = new Carbon($value, 'UTC');
         
-        $this->attributes['close_time'] = $time;
+        $this->attributes[ 'close_time' ] = $time;
     }
     
     /**

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