uidaho / smartsettia

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.

app/Device.php

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

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