uidaho / smartsettia

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

app/Http/Controllers/SiteController.php

Doc Comments +3 added lines, -3 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
             'name' => 'required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name',
         ]);
         
-        $site = Site::create(['name' => $request->name]);
+        $site = Site::create([ 'name' => $request->name ]);
         
         return redirect()->route('site.show', $site->id)
             ->with('success', 'Site created successfully');
@@ -95,7 +95,7 @@ 
             'name' => 'required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name,'.$site->id,
         ]);
         
-        $site->update(['name' => $request->name]);
+        $site->update([ 'name' => $request->name ]);
         
         return redirect()->route('site.show', $site->id)
             ->with('success', 'Site updated successfully');
@@ -111,6 +111,6 @@ 
     {
         Site::findOrFail($id)->delete();
         return redirect()->route('site.index')
-            ->with('success','Site deleted successfully');
+            ->with('success', 'Site deleted successfully');
     }
 }

app/DataTables/LocationDataTable.php

Spacing +5 added lines, -5 removed lines

@@ -15,15 +15,15 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('name', function ($location) {
-                return '<a href="' . route('location.show', $location->id) . '">'. $location->name . '</a>';
+            ->editColumn('name', function($location) {
+                return '<a href="'.route('location.show', $location->id).'">'.$location->name.'</a>';
             })
-            ->editColumn('site_id', function ($location) {
-                return '<a href="' . route('site.show', $location->site_id) . '">'. ($location->site->name ?? '') . '</a>';
+            ->editColumn('site_id', function($location) {
+                return '<a href="'.route('site.show', $location->site_id).'">'.($location->site->name ?? '').'</a>';
             })
             ->addColumn('action', 'location.action')
             ->blacklist([ 'action' ])
-            ->rawColumns(['site_id', 'name', 'action']);
+            ->rawColumns([ 'site_id', 'name', 'action' ]);
     }
     
     /**

app/DataTables/SiteDataTable.php

Spacing +3 added lines, -3 removed lines

@@ -15,12 +15,12 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('name', function ($site) {
-                return '<a href="' . route('site.show', $site->id) . '">'. $site->name . '</a>';
+            ->editColumn('name', function($site) {
+                return '<a href="'.route('site.show', $site->id).'">'.$site->name.'</a>';
             })
             ->addColumn('action', 'site.action')
             ->blacklist([ 'action' ])
-            ->rawColumns(['name', 'action']);
+            ->rawColumns([ 'name', 'action' ]);
     }
     
     /**

app/Http/Requests/EditLocation.php

Spacing +2 added lines, -2 removed lines

@@ -38,11 +38,11 @@
     {
         $validator = parent::getValidatorInstance();
         
-        $validator->sometimes('site', 'required|integer|digits_between:1,10|exists:sites,id', function ($input) {
+        $validator->sometimes('site', 'required|integer|digits_between:1,10|exists:sites,id', function($input) {
             return !$input->new_site_name;
         });
         
-        $validator->sometimes('new_site_name', 'bail|required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name', function ($input) {
+        $validator->sometimes('new_site_name', 'bail|required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name', function($input) {
             return !$input->site;
         });
         

app/Sensor.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      */
     public function getLatestDataAttribute()
     {
-        return $this->hasOne('App\SensorData')->latest()->first() ?? (object)[];
+        return $this->hasOne('App\SensorData')->latest()->first() ?? (object) [ ];
     }
     
     /**