uidaho / smartsettia

app/Http/Controllers/ImageController.php

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

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

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)

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

app/Http/Controllers/DeviceController.php

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

app/User.php

Spacing +1 added lines, -1 removed lines

@@ -143,6 +143,6 @@
     public function roleString()
     {
         $role_en = array(0 => "Registered", 1 => "User", 2 => "Manager", 3 => "Admin");
-        return $role_en[ $this->role ] . ' (' . $this->role . ')';
+        return $role_en[ $this->role ].' ('.$this->role.')';
     }
 }

app/Http/Controllers/ApiController.php

Doc Comments +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
     /**
      * Creates a json response for all the devices.
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function index()
     {
@@ -28,7 +28,7 @@ 
      * Creates a json response for a specifc device.
      *
      * @param  Device  $device
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function show(Device $device)
     {
@@ -39,7 +39,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 @@ 
      * Updates the sensors of a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function sensor(Request $request)
     {
@@ -170,7 +170,7 @@ 
      * Registers a new device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function register(Request $request)
     {
@@ -228,7 +228,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 +14 added lines, -14 removed lines

@@ -21,7 +21,7 @@ 
      */    
     public function index()
     {
-        return response()->json(['data' => 'SmartSettia API - Bad request type.'], 400);
+        return response()->json([ 'data' => 'SmartSettia API - Bad request type.' ], 400);
     }
 
     /**
@@ -90,7 +90,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);
     }
     
     /**
@@ -127,13 +127,13 @@ 
         foreach ($sensor_datas as $sensor_data) {
             $sensor = Sensor::firstOrCreate([
                 "device_id" => $device->id,
-                "name" => $sensor_data['name'], 
-                "type" => $sensor_data['type']
+                "name" => $sensor_data[ 'name' ], 
+                "type" => $sensor_data[ 'type' ]
             ]);
             
             SensorData::create([
                 "sensor_id" => $sensor->id,
-                "value" => $sensor_data['value']
+                "value" => $sensor_data[ 'value' ]
             ]);
         }
         
@@ -143,7 +143,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);
     }
     
     /**
@@ -162,7 +162,7 @@ 
         
         // 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.
@@ -172,7 +172,7 @@ 
                 'uuid' => $device->uuid,
                 'id' => $device->id,
                 'token' => $device->token,
-            ]], 200);
+            ] ], 200);
         }
         
         // Create the new device.
@@ -196,7 +196,7 @@ 
             'uuid' => $device->uuid,
             'id' => $device->id,
             'token' => $device->token,
-        ]], 201);
+        ] ], 201);
     }
     
     /**
@@ -217,21 +217,21 @@ 
         $device = Device::getDeviceByUUID($request->input('uuid'));
         
         // 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);
     }
 }