uidaho / smartsettia

app/DataTables/DevicesDataTable.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\DataTables;
 
 use App\Device;
-use App\Site;
 use Yajra\DataTables\Services\DataTable;
 
 class DevicesDataTable extends DataTable

Spacing +7 added lines, -7 removed lines

@@ -16,19 +16,19 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('name', function ($device) {
-                return '<a href="' . route('device.show', $device->id) . '">' . $device->name . '</a>';
+            ->editColumn('name', function($device) {
+                return '<a href="'.route('device.show', $device->id).'">'.$device->name.'</a>';
             })
-            ->addColumn('location', function ($device) {
+            ->addColumn('location', function($device) {
                 return ($device->location->name ?? 'null');
             })
-            ->addColumn('site', function ($device) {
+            ->addColumn('site', function($device) {
                 return ($device->location->site->name ?? 'null');
             })
-            ->addColumn('rates', function ($device) {
-                return $device->update_rate . '/' . $device->image_rate .'/' . $device->sensor_rate;
+            ->addColumn('rates', function($device) {
+                return $device->update_rate.'/'.$device->image_rate.'/'.$device->sensor_rate;
             })
-            ->editColumn('updated_at', function ($device) {
+            ->editColumn('updated_at', function($device) {
                 return (is_object($device->updated_at) ? $device->updated_at->diffForHumans() : 'never');
             })
             ->blacklist([ 'location', 'site', 'rates' ])

app/DataTables/ActivityLogDataTable.php

Spacing +7 added lines, -7 removed lines

@@ -16,16 +16,16 @@ 
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('causer_id', function ($activity) {
-                return ($activity->causer_id ? '<a href="/' . ($activity->causer_type == "App\User" ? 'user' : 'device') . '/' . $activity->causer_id . '">' . ($activity->causer->name ?? '') . '</a>' : 'App');
+            ->editColumn('causer_id', function($activity) {
+                return ($activity->causer_id ? '<a href="/'.($activity->causer_type == "App\User" ? 'user' : 'device').'/'.$activity->causer_id.'">'.($activity->causer->name ?? '').'</a>' : 'App');
             })
-            ->editColumn('subject_id', function ($activity) {
-                return ($activity->subject_id ? '<a href="/' . ($activity->subject_type == "App\User" ? 'user' : 'device') . '/' . $activity->subject_id . '">' . ($activity->subject->name ?? '') . '</a>' : 'App');
+            ->editColumn('subject_id', function($activity) {
+                return ($activity->subject_id ? '<a href="/'.($activity->subject_type == "App\User" ? 'user' : 'device').'/'.$activity->subject_id.'">'.($activity->subject->name ?? '').'</a>' : 'App');
             })
-            ->editColumn('properties', function ($activity) {
+            ->editColumn('properties', function($activity) {
                 return $activity->properties;
             })
-            ->rawColumns(['causer_id', 'subject_id', 'properties']);
+            ->rawColumns([ 'causer_id', 'subject_id', 'properties' ]);
     }
 
     /**
@@ -98,6 +98,6 @@ 
      */
     protected function filename()
     {
-        return 'activitylog_' . time();
+        return 'activitylog_'.time();
     }
 }

app/Http/Controllers/SensorDataController.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
     {
         SensorData::find($id)->delete();
         return redirect()->route('sensordata.index')
-            ->with('success','SensorData deleted successfully');
+            ->with('success', 'SensorData deleted successfully');
     }
 
 }

Indentation +39 added lines, -39 removed lines

@@ -9,42 +9,42 @@ 
 class SensorDataController extends Controller 
 {
     /**
-    * Create a new controller instance.
-    *
-    * @return void
-    */
+     * Create a new controller instance.
+     *
+     * @return void
+     */
     public function __construct()
     {
         $this->middleware('auth');
     }
 
     /**
-    * Display a listing of the resource.
-    *
-    * @param SensorDataDataTable $dataTable
-    * @return Response
-    */
+     * Display a listing of the resource.
+     *
+     * @param SensorDataDataTable $dataTable
+     * @return Response
+     */
     public function index(SensorDataDataTable $dataTable)
     {
         return $dataTable->render('sensordata.index');
     }
 
     /**
-    * Show the form for creating a new resource.
-    *
-    * @return Response
-    */
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
     public function create()
     {
         return view('sensordata.create');
     }
 
     /**
-    * Store a newly created resource in storage.
-    *
-    * @param Request $request
-    * @return Response
-    */
+     * Store a newly created resource in storage.
+     *
+     * @param Request $request
+     * @return Response
+     */
     public function store(Request $request)
     {
         request()->validate([
@@ -59,12 +59,12 @@ 
     }
 
     /**
-    * Display the specified resource.
-    *
-    * @param  Request  $request
-    * @param  int  $id
-    * @return Response
-    */
+     * Display the specified resource.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
+     */
     public function show(Request $request, $id)
     {
         $sensordata = SensorData::findOrFail($id);
@@ -73,11 +73,11 @@ 
     }
 
     /**
-    * Show the form for editing the specified resource.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function edit(Request $request, $id)
     {
         $sensordata = SensorData::findOrFail($id);
@@ -86,11 +86,11 @@ 
     }
 
     /**
-    * Update the specified resource in storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Update the specified resource in storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function update($id)
     {
         request()->validate([
@@ -103,11 +103,11 @@ 
     }
 
     /**
-    * Remove the specified resource from storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function destroy($id)
     {
         SensorData::find($id)->delete();

Doc Comments +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
     * Store a newly created resource in storage.
     *
     * @param Request $request
-    * @return Response
+    * @return \Illuminate\Http\RedirectResponse
     */
     public function store(Request $request)
     {
@@ -89,7 +89,7 @@ 
     * Update the specified resource in storage.
     *
     * @param  int  $id
-    * @return Response
+    * @return \Illuminate\Http\RedirectResponse
     */
     public function update($id)
     {
@@ -106,7 +106,7 @@ 
     * Remove the specified resource from storage.
     *
     * @param  int  $id
-    * @return Response
+    * @return \Illuminate\Http\RedirectResponse
     */
     public function destroy($id)
     {

app/Http/Controllers/SensorController.php

Indentation +41 added lines, -41 removed lines

@@ -10,42 +10,42 @@ 
 class SensorController extends Controller 
 {
     /**
-    * Create a new controller instance.
-    *
-    * @return void
-    */
+     * Create a new controller instance.
+     *
+     * @return void
+     */
     public function __construct()
     {
         $this->middleware('auth');
     }
 
     /**
-    * Display a listing of the resource.
-    *
-    * @param  SensorDataTable   $dataTable
-    * @return Response
-    */
+     * Display a listing of the resource.
+     *
+     * @param  SensorDataTable   $dataTable
+     * @return Response
+     */
     public function index(SensorDataTable $dataTable)
     {
         return $dataTable->render('sensor.index');
     }
 
     /**
-    * Show the form for creating a new resource.
-    *
-    * @return Response
-    */
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
     public function create()
     {
         return view('sensor.create');
     }
 
     /**
-    * Store a newly created resource in storage.
-    *
-    * @param Request $request
-    * @return Response
-    */
+     * Store a newly created resource in storage.
+     *
+     * @param Request $request
+     * @return Response
+     */
     public function store(Request $request)
     {
         request()->validate([
@@ -61,12 +61,12 @@ 
     }
 
     /**
-    * Display the specified resource.
-    *
-    * @param  Request  $request
-    * @param  int  $id
-    * @return Response
-    */
+     * Display the specified resource.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
+     */
     public function show(Request $request, $id)
     {
         $sensor = Sensor::findOrFail($id);
@@ -75,12 +75,12 @@ 
     }
 
     /**
-    * Show the form for editing the specified resource.
-    *
-    * @param  Request  $request
-    * @param  int  $id
-    * @return Response
-    */
+     * Show the form for editing the specified resource.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
+     */
     public function edit(Request $request, $id)
     {
         $sensor = Sensor::findOrFail($id);
@@ -89,12 +89,12 @@ 
     }
 
     /**
-    * Update the specified resource in storage.
-    *
-    * @param  Request  $request
-    * @param  int  $id
-    * @return Response
-    */
+     * Update the specified resource in storage.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
+     */
     public function update(Request $request, $id)
     {
         request()->validate([
@@ -108,11 +108,11 @@ 
     }
 
     /**
-    * Remove the specified resource from storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function destroy($id)
     {
         Sensor::findOrFail($id)->delete();

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
     {
         Sensor::findOrFail($id)->delete();
         return redirect()->route('sensor.index')
-            ->with('success','Sensor deleted successfully');
+            ->with('success', 'Sensor deleted successfully');
     }
 
 }

Doc Comments +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
     * Store a newly created resource in storage.
     *
     * @param Request $request
-    * @return Response
+    * @return \Illuminate\Http\RedirectResponse
     */
     public function store(Request $request)
     {
@@ -95,7 +95,7 @@ 
     *
     * @param  Request  $request
     * @param  int  $id
-    * @return Response
+    * @return \Illuminate\Http\RedirectResponse
     */
     public function update(Request $request, $id)
     {
@@ -113,7 +113,7 @@ 
     * Remove the specified resource from storage.
     *
     * @param  int  $id
-    * @return Response
+    * @return \Illuminate\Http\RedirectResponse
     */
     public function destroy($id)
     {

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use App\Sensor;
 use App\DataTables\SensorDataTable;
 use Illuminate\Http\Request;
-use Validator;
 use Charts;
 
 class SensorController extends Controller 

app/DataTables/SensorDataDataTable.php

Spacing +6 added lines, -6 removed lines

@@ -15,15 +15,15 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->addColumn('sensor', function ($sensordata) {
-                return '<a href="' . route('sensor.show', $sensordata->sensor_id) . '">'. ($sensordata->sensor->name ?? 'null') . '</a>';
+            ->addColumn('sensor', function($sensordata) {
+                return '<a href="'.route('sensor.show', $sensordata->sensor_id).'">'.($sensordata->sensor->name ?? 'null').'</a>';
             })
-            ->addColumn('device', function ($sensordata) {
-                return '<a href="' . route('device.show', $sensordata->sensor->device->id ?? '0') . '">'. ($sensordata->sensor->device->name ?? 'null') . '</a>';
+            ->addColumn('device', function($sensordata) {
+                return '<a href="'.route('device.show', $sensordata->sensor->device->id ?? '0').'">'.($sensordata->sensor->device->name ?? 'null').'</a>';
             })
             ->addColumn('action', 'sensordata.action')
-            ->blacklist([ 'action'])
-            ->rawColumns(['device', 'sensor', 'action']);
+            ->blacklist([ 'action' ])
+            ->rawColumns([ 'device', 'sensor', 'action' ]);
     }
 
     /**

app/DataTables/SensorDataTable.php

Spacing +7 added lines, -7 removed lines

@@ -15,18 +15,18 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('name', function ($sensor) {
-                return '<a href="' . route('sensor.show', $sensor->id) . '">'. $sensor->name . '</a>';
+            ->editColumn('name', function($sensor) {
+                return '<a href="'.route('sensor.show', $sensor->id).'">'.$sensor->name.'</a>';
             })
-            ->editColumn('device_id', function ($sensor) {
-                return '<a href="' . route('device.show', $sensor->device_id) . '">'. ($sensor->device->name ?? '') . '</a>';
+            ->editColumn('device_id', function($sensor) {
+                return '<a href="'.route('device.show', $sensor->device_id).'">'.($sensor->device->name ?? '').'</a>';
             })
-            ->addColumn('value', function ($sensor) {
-                return '<a href="' . route('sensordata.show', $sensor->latest_data->id ?? '0') . '">'. ($sensor->latest_data->value ?? 'null') . '</a>';
+            ->addColumn('value', function($sensor) {
+                return '<a href="'.route('sensordata.show', $sensor->latest_data->id ?? '0').'">'.($sensor->latest_data->value ?? 'null').'</a>';
             })
             ->addColumn('action', 'sensor.action')
             ->blacklist([ 'value', 'action' ])
-            ->rawColumns(['device_id', 'name', 'value', 'action']);
+            ->rawColumns([ 'device_id', 'name', 'value', 'action' ]);
     }
 
     /**

app/Http/Controllers/UserController.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Validator;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\DataTables\UsersDataTable;

Spacing +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
         }
 
         return redirect()->route('user.index')
-            ->with('success','User deleted successfully');
+            ->with('success', 'User deleted successfully');
     }
     
     /**
@@ -170,6 +170,6 @@ 
         $user->restore();
         
         return redirect()->route('user.show', $user->id)
-            ->with('success','User restored successfully');
+            ->with('success', 'User restored successfully');
     }
 }

app/DataTables/UsersDataTable.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     {
         return datatables($query)
             ->editColumn('name', function(User $user) {
-                return '<a href="' . route('user.show', $user->id) . '">'. $user->name . '</a>';
+                return '<a href="'.route('user.show', $user->id).'">'.$user->name.'</a>';
             })
 
             ->editColumn('role', function(User $user) {

app/Http/Controllers/LocationController.php

Doc Comments +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  EditLocation $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(EditLocation $request)
     {
@@ -97,7 +97,7 @@ 
      *
      * @param  EditLocation  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(EditLocation $request, $id)
     {
@@ -122,7 +122,7 @@ 
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy($id)
     {

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\DataTables\LocationDataTable;
 use App\Location;
 use App\Site;

Spacing +5 added lines, -5 removed lines

@@ -52,13 +52,13 @@ 
         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
             $site_id = $request->input('site');
     
-        $location = Location::create(['name' => $request->input('name'), 'site_id' => $site_id]);
+        $location = Location::create([ 'name' => $request->input('name'), 'site_id' => $site_id ]);
     
         return redirect()->route('location.show', $location->id)
             ->with('success', 'Location created successfully');
@@ -105,14 +105,14 @@ 
         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
             $site_id = $request->input('site');
         
         //Update the location with the supplied name and the site
-        Location::findOrFail($id)->update(['name' => $request->input('name'), 'site_id' => $site_id]);
+        Location::findOrFail($id)->update([ 'name' => $request->input('name'), 'site_id' => $site_id ]);
         
         return redirect()->route('location.show', $id)
             ->with('success', 'Location updated successfully');
@@ -128,6 +128,6 @@ 
     {
         Location::findOrFail($id)->delete();
         return redirect()->route('location.index')
-            ->with('success','Location deleted successfully');
+            ->with('success', 'Location deleted successfully');
     }
 }

Braces +4 added lines, -4 removed lines

@@ -54,9 +54,9 @@ 
             //Create a new site
             $site = Site::create(['name' => $request->input('new_site_name')]);
             $site_id = $site->id;
+        } else {
+                    $site_id = $request->input('site');
         }
-        else
-            $site_id = $request->input('site');
     
         $location = Location::create(['name' => $request->input('name'), 'site_id' => $site_id]);
     
@@ -107,9 +107,9 @@ 
             //Create a new site
             $site = Site::create(['name' => $request->input('new_site_name')]);
             $site_id = $site->id;
+        } else {
+                    $site_id = $request->input('site');
         }
-        else
-            $site_id = $request->input('site');
         
         //Update the location with the supplied name and the site
         Location::findOrFail($id)->update(['name' => $request->input('name'), 'site_id' => $site_id]);