murrant / librenmsv2

app/Api/Transformers/PortTransformer.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Include Device
      *
-     * @return League\Fractal\ItemResource
+     * @return Fractal\Resource\Item
      */
     public function includeDevice(Port $port)
     {

app/Http/Controllers/NotificationController.php

Doc Comments +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     /**
      * Update a notifications status.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update($id, $action)
     {
@@ -55,7 +55,7 @@ 
     /**
      * Create a new notification
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function create(Request $request)
     {

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
             $page   = '';
             $button = 'Notifications';
             $bg     = 'maroon';
-        }
-        else {
+        } else {
             $page   = 'archive';
             $button = 'Archive';
             $bg     = 'blue';

app/Models/Notification.php

Doc Comments +3 added lines

@@ -42,6 +42,9 @@
         $this->setAttrib('sticky', $enabled);
     }
 
+    /**
+     * @param string $name
+     */
     private function setAttrib($name, $enabled) {
         if ($enabled === true) {
             $read = new NotificationAttrib;

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
             $read->value            = 1;
 
             return $this->attribs()->save($read);
-        }
-        else {
+        } else {
             return $this->attribs()->where('key', $name)->delete();
         }
     }

app/Models/User.php

Doc Comments +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     /**
      * Test if the User is an admin or demo.
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return boolean
      */
     public function isAdmin()
     {
@@ -42,7 +42,7 @@ 
      * Test if this user has global read access
      * these users have a level of 5, 10 or 11 (demo).
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return boolean
      */
     public function hasGlobalRead()
     {

app/Settings.php

Doc Comments +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
      * Clear the settings cache.
      * If path is set, only clear the path and it's parents.
      *
-     * @param null $key The path to clear.
+     * @param string $key The path to clear.
      */
     public function flush($key = null)
     {

Braces +6 added lines, -12 removed lines

@@ -70,19 +70,16 @@ 
                     if (is_string($k) && !str_contains($k, '.') && DbConfig::exactKey($key)->exists() && DbConfig::key($key)->count() == 1) {
                         // check that we aren't trying to set an array onto an existing value only setting
                         throw new \Exception("Attempting to set array value to existing non-array value at the key '" . $key . "'");
-                    }
-                    else {
+                    } else {
                         // we are not at the leaf yet, add this chunk to the key and recurse
                         $this->set($key . '.' . $k, $v);
                     }
-                }
-                else {
+                } else {
                     // a leaf, recurse one last time
                     $this->set($k, $v);
                 }
             }
-        }
-        else {
+        } else {
             // make sure we can save this
             if ($this->isReadOnly($key)) {
                 throw new \Exception("The setting '" . $key . "' is read only");
@@ -122,16 +119,14 @@ 
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
                 // return a value if we are getting one item
                 return $db_data->first()->config_value;
-            }
-            elseif (count($db_data) >= 1) {
+            } elseif (count($db_data) >= 1) {
                 // convert the collection to an array
                 $result = self::collectionToArray($db_data, $key);
 
                 // if we have config_data, merge them
                 if (isset($config_data)) {
                     return array_replace_recursive($result, $config_data);
-                }
-                else {
+                } else {
                     return $result;
                 }
             }
@@ -227,8 +222,7 @@ 
         if (is_null($key)) {
             // Clear all cache
             Cache::tags(self::$cache_tag)->flush();
-        }
-        else {
+        } else {
             // Clear specific path
             $path = [];
             foreach (explode('.', $key) as $element) {

app/Api/Controllers/PortController.php

Braces +2 added lines, -4 removed lines

@@ -26,8 +26,7 @@ 
     {
         if (Auth::user()->hasGlobalRead()) {
             $ports = Port::all();
-        }
-        else {
+        } else {
             $ports = Auth::user()->ports()->get();
         }
 
@@ -70,8 +69,7 @@ 
     {
         if ($request->user()->hasGlobalRead()) {
             return Port::find($id);
-        }
-        else {
+        } else {
             $user = User::find($request->user()->user_id);
             return $user->ports()->find($id);
         }

app/Api/Controllers/APIController.php

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
         $versions['db_driver'] = strtoupper(DB::connection()->getDriverName());
 	if ($versions['db_driver'] == 'SQLITE') {
             $versions['db_version'] = DB::select('SELECT sqlite_version() AS version')[0]->version;
-        }
-        else {
+        } else {
             $versions['db_version'] = DB::select('SELECT version() AS version')[0]->version;
         }
         return $versions;

app/Api/Controllers/DeviceController.php

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
         // fetch devices from the database
         if ($request->user()->hasGlobalRead()) {
             $devices = Device::all();
-        }
-        else {
+        } else {
             $devices = User::find($request->user()->user_id)->devices()->get();
         }
         // morph the data as required
@@ -64,8 +63,7 @@ 
     {
         if ($request->user()->hasGlobalRead()) {
             $device = Device::find($id);
-        }
-        else {
+        } else {
             $user = User::find($request->user()->user_id);
             $device =  $user->devices()->find($id);
         }

app/Api/Controllers/NotificationController.php

Braces +4 added lines, -8 removed lines

@@ -27,8 +27,7 @@ 
         if ($type === 'archive')
         {
             $notifications = Notification::IsArchived($request)->get();
-        }
-        else {
+        } else {
             $notifications = Notification::IsUnread()->get();
         }
         return $notifications;
@@ -45,15 +44,13 @@ 
 
         if ($action == 'read') {
            $result = $notification->markRead($enable);
-        }
-        elseif ($action == 'sticky') {
+        } elseif ($action == 'sticky') {
            $result = $notification->markSticky(false);
         }
 
         if ($result === false) {
             return $this->response->errorInternal();
-        }
-        else {
+        } else {
             return $this->response->array(array('statusText' => 'OK'));
         }
     }
@@ -73,8 +70,7 @@ 
         if ($notification->save())
         {
             return $this->response->array(array('statusText' => 'OK'));
-        }
-        else {
+        } else {
             return $this->response->errorInternal();
         }
     }