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

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      *
      * @var array
      */
-    protected $hidden = ['token'];
+    protected $hidden = [ 'token' ];
     
     /**
      * The attributes that are mass assignable.

Doc Comments +2 added lines, -2 removed lines

@@ -131,7 +131,7 @@ 
      *
      * @param int $location_id
      * @param int $site_id
-     * @return Device|Illuminate\Database\Eloquent\Model
+     * @return integer
      */
     public function getLocationUpdateDevice($location_id, $site_id)
     {
@@ -160,7 +160,7 @@ 
      * Get the very first device and its location and site info based on location id and site id
      *
      * @param int $site_id
-     * @return Device|Illuminate\Database\Eloquent\Model
+     * @return integer
      */
     public function getSiteUpdateDevice($site_id)
     {

app/Http/Controllers/ApiController.php

Unused Use Statements -2 removed lines

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

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);
     }
 }
 

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

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 use App\Device;
 use App\Site;
 use App\Location;

app/Site.php

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
      */
     public function getSitesExclude($id)
     {
-        $sites = self::select(['id', 'name'])
+        $sites = self::select([ 'id', 'name' ])
                         ->where('id', '!=', $id)
                         ->orderBy('name')->get();
         return $sites;
@@ -56,8 +56,8 @@ 
      */
     public function orderedSitesBy($id)
     {
-        $sites = self::query()->select(['id', 'name'])
-                                ->orderByRaw(DB::raw("(id = " . $id . ") DESC"))
+        $sites = self::query()->select([ 'id', 'name' ])
+                                ->orderByRaw(DB::raw("(id = ".$id.") DESC"))
                                 ->get();
         return $sites;
     }

app/Http/Controllers/DeviceController.php

Spacing +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
      */
     public function details($id)
     {
-        $device = $this->device_m->select(['id', 'name', 'location_id', 'open_time', 'close_time'])
+        $device = $this->device_m->select([ 'id', 'name', 'location_id', 'open_time', 'close_time' ])
                                     ->findOrFail($id);
         
         return $device;
@@ -179,7 +179,7 @@ 
         
         if ($validator->fails()) {
             if ($request->input('from') == 'modal')
-                return response()->json(['errors'=>$validator->errors()], 422);
+                return response()->json([ 'errors'=>$validator->errors() ], 422);
             else
                 return redirect('device/'.$id.'/edit')->withErrors($validator)->withInput();
         }

Braces +15 added lines, -18 removed lines

@@ -80,8 +80,7 @@ 
         {
             $sites = $this->site_m->orderedSitesBy($location->site_id);
             $locations = $this->location_m->orderedSiteLocationsBy($location->site_id, $device->location_id);
-        }
-        else
+        } else
         {
             $locations = null;
             $sites = $this->site_m->all();
@@ -178,10 +177,11 @@ 
         ]);
         
         if ($validator->fails()) {
-            if ($request->input('from') == 'modal')
-                return response()->json(['errors'=>$validator->errors()], 422);
-            else
-                return redirect('device/'.$id.'/edit')->withErrors($validator)->withInput();
+            if ($request->input('from') == 'modal') {
+                            return response()->json(['errors'=>$validator->errors()], 422);
+            } else {
+                            return redirect('device/'.$id.'/edit')->withErrors($validator)->withInput();
+            }
         }
         
         $siteNew = !empty($request->input('new_site_name'));
@@ -191,8 +191,7 @@ 
             //Create a new site
             $siteName = $request->input('new_site_name');
             $site_id = $this->site_m->createSite($siteName);
-        }
-        else
+        } else
         {
             $site_id = $request->input('site');
         }
@@ -204,8 +203,7 @@ 
             //Create a new location
             $locationName = $request->input('new_location_name');
             $location_id = $this->location_m->createLocation($locationName, $site_id);
-        }
-        else
+        } else
         {
             $location_id = $request->input('location');
         }
@@ -220,10 +218,11 @@ 
         //If the old site isn't connected to a device then remove it
         $this->removeUnusedSite($oldLocationID);
         
-        if ($request->input('from') == 'modal')
-            return "Success";
-        else
-            return redirect('device');
+        if ($request->input('from') == 'modal') {
+                    return "Success";
+        } else {
+                    return redirect('device');
+        }
     }
 
     /**
@@ -240,8 +239,7 @@ 
         {
             //If the user was already deleted then permanently delete it
             $this->device_m->destroy($id);
-        }
-        else
+        } else
         {
             //Remove the location from the device
             $oldLocation_id = $device->location_id;
@@ -287,8 +285,7 @@ 
             {
                 //Get the site connected to the location and delete it
                 $this->site_m->findOrFail($site_id)->delete();
-            }
-            else
+            } else
             {
                 //Delete the location that isn't used anymore
                 $oldLocation->delete();

app/Location.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
      */
     public function getLocsBasedOnSiteExclude($site_id, $location_id)
     {
-        return self::select(['id', 'name'])
+        return self::select([ 'id', 'name' ])
                         ->where('site_id', '=', $site_id)
                         ->where('id', '!=', $location_id)
                         ->orderBy('name')->get();
@@ -70,9 +70,9 @@ 
      */
     public function orderedSiteLocationsBy($site_id, $location_id)
     {
-        $locations = self::query()->select(['id', 'name'])
+        $locations = self::query()->select([ 'id', 'name' ])
                                     ->where('site_id', '=', $site_id)
-                                    ->orderByRaw(DB::raw("(id = " . $location_id . ") DESC"))
+                                    ->orderByRaw(DB::raw("(id = ".$location_id.") DESC"))
                                     ->get();
         return $locations;
     }