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/Http/Controllers/ApiController.php

Doc Comments +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
     /**
      * Creates a json response for all the devices.
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function index()
     {
@@ -25,7 +25,7 @@ 
      * Creates a json response for a specifc device.
      *
      * @param  Device  $device
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function show(Device $device)
     {
@@ -36,7 +36,7 @@ 
      * Updates the status of a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(Request $request)
     {
@@ -107,7 +107,7 @@ 
      * Registers a new device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function register(Request $request)
     {
@@ -164,7 +164,7 @@ 
      * Updates the image for a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function image(Request $request) {
         // Validate the request.

Spacing +15 added lines, -15 removed lines

@@ -18,7 +18,7 @@ 
      */    
     public function index()
     {
-        return response()->json(['data' => 'SmartSettia API - Bad request type.'], 400);
+        return response()->json([ 'data' => 'SmartSettia API - Bad request type.' ], 400);
     }
 
     /**
@@ -62,7 +62,7 @@ 
         
         // If validation fails, send the validation error back with status 400.
         if ($validator->fails()) {
-            return response()->json(['data' => $validator->errors()], 400);
+            return response()->json([ 'data' => $validator->errors() ], 400);
         }
         
         // Get the device record.
@@ -70,7 +70,7 @@ 
         
         // If token doesnt match then send 401 unauthorized.
         if ($request->input('token') != $device->token) {
-            return response()->json(['data' => 'Bad token.'], 401);
+            return response()->json([ 'data' => 'Bad token.' ], 401);
         }
         
         // Update the device.
@@ -100,7 +100,7 @@ 
         //event(new Registered(true));
         
         // Return the new device info including the token.
-        return response()->json(['data' => $device->toArray()], 201);
+        return response()->json([ 'data' => $device->toArray() ], 201);
     }
     
     /**
@@ -119,12 +119,12 @@ 
         
         // If validation fails, send the validation error back with status 400.
         if ($validator->fails()) {
-            return response()->json(['data' => $validator->errors()], 400);
+            return response()->json([ 'data' => $validator->errors() ], 400);
         }
         
         // If challenge string doesnt match then send 401 unauthorized.
         if ($request->input('challenge') != env('API_CHALLENGE', 'temppass')) {
-            return response()->json(['data' => 'Bad challenge.'], 401);
+            return response()->json([ 'data' => 'Bad challenge.' ], 401);
         }
         
         // If the uuid already exists then just send them the record.
@@ -134,7 +134,7 @@ 
                 'uuid' => $device->uuid,
                 'id' => $device->id,
                 'token' => $device->token,
-            ]], 200);
+            ] ], 200);
         }
         
         // Create the new device.
@@ -157,7 +157,7 @@ 
             'uuid' => $device->uuid,
             'id' => $device->id,
             'token' => $device->token,
-        ]], 201);
+        ] ], 201);
     }
     
     /**
@@ -176,7 +176,7 @@ 
         
         // If validation fails, send the validation error back with status 400.
         if ($validator->fails()) {
-            return response()->json(['data' => $validator->errors()], 400);
+            return response()->json([ 'data' => $validator->errors() ], 400);
         }
         
         // Get the device record.
@@ -184,25 +184,25 @@ 
         
         // If token doesnt match then send 401 unauthorized.
         if ($request->input('token') != $device->token) {
-            return response()->json(['data' => 'Bad token.'], 401);
+            return response()->json([ 'data' => 'Bad token.' ], 401);
         }
         
         // Save the image to disk.
-        $path = $request->file('image')->storeAs('deviceimage', $device['id'], 'private');
+        $path = $request->file('image')->storeAs('deviceimage', $device[ 'id' ], 'private');
         
         // Update the url for the image.
         $deviceimage = Deviceimage::updateOrCreate(
-            ['device_id' => $device['id']],
-            ['url' => $path]
+            [ 'device_id' => $device[ 'id' ] ],
+            [ 'url' => $path ]
         );
         
         // Force the updated_at timestamp to update as the url may not change.
         $deviceimage->touch();
         
         return response()->json([ 'data' => [ 
-            'id' => $deviceimage['id'],
+            'id' => $deviceimage[ 'id' ],
             'url' => $path,
-        ]], 201);
+        ] ], 201);
     }
 }
 

Unused Use Statements -2 removed lines

@@ -7,8 +7,6 @@
 use App\Device;
 use App\Deviceimage;
 use App\User;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Storage;
 
 class ApiController extends Controller
 {

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

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\DB;
 
 class Location extends Model
 {

app/Site.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\DB;
 
 class Site extends Model
 {

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)
     {

Braces +19 added lines, -13 removed lines

@@ -80,27 +80,31 @@ 
         //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
         {
             //Get the first site and if no sites exist throw an error
             $site = Site::select('id', 'name')->firstOrFail();
+        }
             //Get the first location from the 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($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);
         
@@ -185,8 +189,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)
@@ -224,13 +229,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;
     }

Spacing +10 added lines, -10 removed lines

@@ -38,7 +38,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 ] ]);
     }
     
     /**
@@ -99,7 +99,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 ] ]);
     }
     
     /**
@@ -119,7 +119,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 ] ]);
     }
     
     /**
@@ -139,7 +139,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 ] ]);
     }
     
     /**
@@ -161,9 +161,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 ]);
     }
     
     /**
@@ -184,7 +184,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';
@@ -220,12 +220,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;
     }

app/Http/Controllers/DeviceController.php

Doc Comments +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
      * Get the locations with the given site id
      *
      * @param  int $site_id
-     * @return Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Http\JsonResponse
      */
     public function locations($site_id)
     {
@@ -116,7 +116,7 @@ 
      * Get the devices details
      *
      * @param  int  $id
-     * @return Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Http\JsonResponse
      */
     public function details($id)
     {

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;

Braces +14 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 ]);
+        }
     }
     
     /**
@@ -146,8 +146,7 @@ 
             //Create a new site
             $siteName = $request->input('new_site_name');
             $site_id = Site::createSite($siteName)->id;
-        }
-        else
+        } else
         {
             $site_id = $request->input('site');
         }
@@ -158,8 +157,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');
         }
@@ -177,10 +175,11 @@ 
         //Remove any unused sites or locations
         $this->RemoveUnusedSiteLoc();
     
-        if (\Request::ajax())
-            return response()->json("Success");
-        else
-            return redirect('device');
+        if (\Request::ajax()) {
+                    return response()->json("Success");
+        } else {
+                    return redirect('device');
+        }
     }
 
     /**
@@ -197,8 +196,7 @@ 
         {
             //If the device was already deleted then permanently delete it
             Device::destroy($id);
-        }
-        else
+        } else
         {
             //Remove the location from the device
             $device->location_id = null;